github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,928 Commits 34 Branches 105 Tags
fcbde454f673a2b393942b09f855a4febcf331fa
Commit Graph

23928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
fcbde454f6 Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. 2011-07-18 00:22:26 +01:00
Santiago Pastorino
e9bd83402e Merge pull request #2046 from sikachu/master-test_fix 
Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
 2011-07-17 12:48:49 -07:00
Prem Sichanugrist
edfb81d668 Fix a wrong assertion on url_helper_test, and refactor html_safe test to be in its method 2011-07-17 15:34:01 -04:00
Santiago Pastorino
7669c33c74 Merge pull request #2018 from bhus/render_partial_invalid_check 
Render partial invalid check
 2011-07-17 12:28:03 -07:00
Jon Leighton
ac97e25235 Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again. 
This reverts commit e4479b2f1b.
 2011-07-17 19:55:05 +01:00
Santiago Pastorino
2f00854d22 Merge pull request #2118 from arunagw/fix_plugin_gen_test 
As we are adding db folder in it. Required in test also.
 2011-07-17 10:04:53 -07:00
Arun Agrawal
24d67cc9df As we are adding db folder in it. Required in test also. 2011-07-17 18:39:33 +05:30
Xavier Noria
0aec2e7191 indeed, if we are going to remove everything in public/assets on assets:clean, just do that 2011-07-17 00:44:00 +02:00
Xavier Noria
53f6acd252 if we are cleaning all files, we are cleaning all gz files 2011-07-17 00:35:21 +02:00
Santiago Pastorino
296b1eef67 Merge pull request #2082 from htanata/rake_routes_formatting 
Better formatting of rake routes (issue #1991)
 2011-07-16 11:22:58 -07:00
Hendy Tanata
7b619f1d7b Improve formatting of route to Rack application in rake routes. 
This route:

    match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/

is shown as:

    /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/}
 2011-07-17 00:49:48 +08:00
Santiago Pastorino
e98d747705 Merge pull request #2108 from loz/master 
Adds gem helper rake tasks to engines generator
 2011-07-16 08:43:51 -07:00
Jonathan Lozinski
8b080b3831 Added gem helper to rake task for engines, as per pull request from 3-1-stable, #2103 2011-07-16 16:06:44 +01:00
Santiago Pastorino
3e06ec8944 Fix the output a bit 2011-07-16 09:54:03 -03:00
José Valim
94d8e6bdf8 Merge pull request #2101 from loz/master 
Added db to gemspec so migrations are packaged
 2011-07-16 04:02:12 -07:00
Jonathan Lozinski
06c9dd1906 Added db to gemspec files so migrations are correctly packaged 2011-07-16 06:48:54 +01:00
Santiago Pastorino
c2b62addfe Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog 
Fix wildcard route code example in changelog
 2011-07-15 14:24:43 -07:00
Hendy Tanata
d7f4a3ef78 Fix wildcard route code example in changelog. 2011-07-16 04:27:27 +08:00
Hendy Tanata
193e4de206 Better formatting of route requirements in rake:routes. 
Previously it was:

    {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/}

Now it becomes:

    photos#show {:id=>/[A-Z]\d{5}/}
 2011-07-16 04:23:05 +08:00
Santiago Pastorino
f88e9d83f1 Merge pull request #2073 from bfolkens/master 
ported test from pull request #2071 to master
 2011-07-14 12:19:21 -07:00
Bradford Folkens
4755930727 assert nothing raised for setting a cookie value to nil in ActionDispatch 2011-07-14 14:01:39 -05:00
Santiago Pastorino
31ea0276a4 Merge pull request #2063 from elight/master 
Patch for https://github.com/rails/rails/issues/2059
 2011-07-14 11:14:27 -07:00
Evan Light
f13dea8a34 Fix and unit test for https://github.com/rails/rails/issues/2059 
Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key

Minor refactoring to cache_key timezone test

Closes #2059

Adds a test to validate the format of the cache_key for nil and present updated_at values

Correctly handles updated_at == nil
 2011-07-14 14:04:02 -04:00
Santiago Pastorino
d632e927ec Merge pull request #1807 from caius/find_in_batches_id_bug 
Bugfix by stopping find_in_batches using the records after yielding.
 2011-07-14 07:57:04 -07:00
Aaron Patterson
db0a65cbe0 Merge pull request #2066 from amatsuda/magicome 
missing magic comments
 2011-07-14 01:30:53 -07:00
Akira Matsuda
99d598a131 need magic comments 2011-07-14 12:39:34 +09:00
Aaron Patterson
003c6516dc Merge pull request #2052 from amatsuda/fullwidth_blank 
treat fullwidth whitespace as a blank character
 2011-07-13 19:04:28 -07:00
Santiago Pastorino
54ab63ee77 Bump rack up 2011-07-13 21:40:46 -03:00
Akira Matsuda
9c60860322 treat fullwidth whitespace as a blank character 2011-07-14 07:48:39 +09:00
huskins
2668dce1c0 Added view template invalid name check, along with tests. No merges in commit. 2011-07-13 13:06:03 -04:00
José Valim
704ee0df65 Use cache/assets instead. 2011-07-12 22:55:34 -03:00
José Valim
8f0e0b63f5 assets.cache_store now defaults to filesystem. You will want to share tmp/assets_cache between deploys. 2011-07-12 22:30:17 -03:00
Santiago Pastorino
8cf45150de Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patch 
Fix for SqlBypass session store (for master)
 2011-07-12 15:06:00 -07:00
Santiago Pastorino
4735e2ec65 Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test 
Fixed session ID fixation for ActiveRecord::SessionStore (for master)
 2011-07-12 15:05:29 -07:00
José Valim
8f58bd49d7 Merge pull request #2038 from FLOChip/extra_space 
remove extra space since comment_if already returns the space.
 2011-07-12 11:49:32 -07:00
Joseph Wong
88e6c06242 Fix for SqlBypass session store 
Two issues fixed:
1) connection_pool is not defined - needed by SessionStore#drop_table!
and create_table! since c94651f

2) initialization of connection to the default of AR::Base.connection
only occurred at the singleton level - the instance level method defined
by cattr_accessor did not have this logic
 2011-07-12 11:10:25 -07:00
Joseph Wong
66dee26930 Fixed session ID fixation for ActiveRecord::SessionStore 
I have found that Rails will take an invalid session ID specified by the
client and materialize a session based on that session ID. This means
that it is possible, among other things, for a client to use an
arbitrarily weak session ID or for a client to resurrect a previous used
session ID. In other words, we cannot guarantee that all session IDs are
generated by the server and that they are (statistically) unique through
time.

The fix is to always generate a new session ID in #get_session if an
existing session cannot be found under the incoming session ID.

Also added new tests that make sure that an invalid session ID is never
materialized into a new session, regardless of whether it comes in via a
cookie or a URL parameter (when :cookie_only => false).
 2011-07-12 11:09:11 -07:00
Teng Siong Ong
5e73a2fa50 remove extra space since comment_if already returns the space. 2011-07-13 00:59:30 +08:00
Jon Leighton
e4479b2f1b Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates. 2011-07-12 00:14:45 +01:00
Jon Leighton
1712d90050 Fix exception if old and new targets are both nil. Fixes #1471. 2011-07-12 00:14:45 +01:00
Joshua Peek
5c8be9eb86 Ensure Dir.glob is sorted 2011-07-11 16:09:46 -07:00
Marc-Andre Lafortune
eeb58b0934 Generate valid default fixtures for models with a type column 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2011-07-11 19:47:57 -03:00
José Valim
1939fa3f16 Merge pull request #1722 from AndrewRadev/grouped-select 
Make "select" helper handle nested collections
 2011-07-11 10:25:04 -07:00
José Valim
133a20354e Merge pull request #1756 from shtirlic/xmlschema_fix 
Fix xmlschema output with fraction_digits >0
 2011-07-11 10:00:28 -07:00
Andrew Radev
587dd7d56c Grouped select helper 
FormBuilder#select now works with a nested data structure.
 2011-07-11 19:08:23 +03:00
Xavier Noria
91bba21815 Merge pull request #2032 from dziulius/master 
#many? - uses count instead of select
 2011-07-11 08:36:15 -07:00
shtirlic
c2b79c011f Fix xmlschema output with fraction_digits >0 
Current implementation produce incorrect output when Time#usec returns
integer < 100000, because to_s doesn't add leading zeros.
 2011-07-11 18:41:04 +04:00
José Valim
1fdbd4708f Merge pull request #2009 from vatrai/autoload-todo-new 
TODO fix explicitly loading exceptations, autoload removed
 2011-07-11 07:35:43 -07:00
José Valim
3da3df8fcb Require assets in all environments by default and provide a way to opt-out from uglifier. 2011-07-11 11:19:03 -03:00
José Valim
d5e8722683 Merge pull request #2029 from sikachu/acronym_mention 
Mention about acronym inflection in config/initializers/inflections.rb
 2011-07-11 06:51:24 -07:00