| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Replace map+compact with select | John Firebaugh | 2011-07-17 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add a test | John Firebaugh | 2011-07-17 | 1 | -0/+5 | |
| | | | | | ||||||
| | * | | | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 2 | -7/+14 | |
| | | | | | ||||||
| * | | | | Merge pull request #2075 from lawrencepit/match_attribute_method | José Valim | 2011-07-18 | 1 | -6/+27 | |
| |\ \ \ \ | | | | | | | | | | | Optimization of ActiveModel's match_attribute_method? | |||||
| | * | | | | Made attribute_method_matchers_cache private + doc | Lawrence Pit | 2011-07-17 | 1 | -3/+13 | |
| | | | | | | ||||||
| | * | | | | Issue #2075 Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-16 | 1 | -9/+17 | |
| | | | | | | ||||||
| | * | | | | Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-15 | 1 | -2/+5 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge pull request #2128 from sikachu/master-dynamic_finder | Jon Leighton | 2011-07-18 | 4 | -16/+49 | |
| |\ \ \ \ | | | | | | | | | | | Raise an ArgumentError if user passing less number of argument in the dynamic finder | |||||
| | * | | | | Refactor test case to use anonymous class - Thank you @tenderlove | Prem Sichanugrist | 2011-07-18 | 1 | -13/+8 | |
| | | | | | | ||||||
| | * | | | | Refactor the code a bit to reduce the duplication | Prem Sichanugrist | 2011-07-17 | 1 | -17/+8 | |
| | | | | | | ||||||
| | * | | | | Raise an ArgumentError if user passing less number of argument in the ↵ | Prem Sichanugrist | 2011-07-17 | 4 | -0/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic finder The previous behavior was unintentional, and some people was relying on it. Now the dynamic finder will always expecting the number of arguments to be equal or greater (so you can still pass the options to it.) So if you were doing this and expecting the second argument to be nil: User.find_by_username_and_group("sikachu") You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this: User.find_by_username_and_group("sikachu", nil) | |||||
| * | | | | | make tzinfo a development dependency | Aaron Patterson | 2011-07-18 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #2124 from arunagw/render_partial_invalid_check_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Checking with to_s. As regexp fail with 1.8.7 | |||||
| | * | | | | | Checking with to_s. As regexp fail with 1.8.7 | Arun Agrawal | 2011-07-18 | 1 | -2/+1 | |
| | |/ / / / | ||||||
| * / / / / | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵ | Jon Leighton | 2011-07-18 | 2 | -5/+2 | |
| |/ / / / | | | | | | | | | | | | | warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. | |||||
| * | | | | Merge pull request #2046 from sikachu/master-test_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+6 | |
| |\ \ \ \ | | | | | | | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a | |||||
| | * | | | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵ | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 | |
| | | |/ / | |/| | | | | | | | | | | be in its method | |||||
| * | | | | Merge pull request #2018 from bhus/render_partial_invalid_check | Santiago Pastorino | 2011-07-17 | 3 | -0/+16 | |
| |\ \ \ \ | | | | | | | | | | | Render partial invalid check | |||||
| | * | | | | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 3 | -0/+16 | |
| | | | | | | ||||||
| * | | | | | Revert "Fix failure in test_preserves_existing_fixture_data from ↵ | Jon Leighton | 2011-07-17 | 1 | -2/+2 | |
| | |/ / / |/| | | | | | | | | | | | | | | | | | | | 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 e4479b2f1bc54edf155408d51dd3236955150ce1. | |||||
| * | | | | Merge pull request #2118 from arunagw/fix_plugin_gen_test | Santiago Pastorino | 2011-07-17 | 1 | -1/+1 | |
| |\ \ \ \ | |_|_|/ |/| | | | As we are adding db folder in it. Required in test also. | |||||
| | * | | | As we are adding db folder in it. Required in test also. | Arun Agrawal | 2011-07-17 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | indeed, if we are going to remove everything in public/assets on ↵ | Xavier Noria | 2011-07-17 | 1 | -4/+1 | |
| | | | | | | | | | | | | | assets:clean, just do that | |||||
| * | | | if we are cleaning all files, we are cleaning all gz files | Xavier Noria | 2011-07-17 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 4 | -15/+107 | |
| |\ \ \ | | | | | | | | | Better formatting of rake routes (issue #1991) | |||||
| | * | | | Improve formatting of route to Rack application in rake routes. | Hendy Tanata | 2011-07-17 | 2 | -3/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This route: match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/ is shown as: /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/} | |||||
| | * | | | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 4 | -14/+85 | |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/} | |||||
| * | | | Merge pull request #2108 from loz/master | Santiago Pastorino | 2011-07-16 | 1 | -0/+5 | |
| |\ \ \ | | | | | | | | | Adds gem helper rake tasks to engines generator | |||||
| | * | | | Added gem helper to rake task for engines, as per pull request from ↵ | Jonathan Lozinski | 2011-07-16 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | 3-1-stable, #2103 | |||||
| * | | | | Fix the output a bit | Santiago Pastorino | 2011-07-16 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #2101 from loz/master | José Valim | 2011-07-16 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | Added db to gemspec so migrations are packaged | |||||
| | * | | | Added db to gemspec files so migrations are correctly packaged | Jonathan Lozinski | 2011-07-16 | 1 | -1/+1 | |
| | |/ / | ||||||
| * | | | Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog | Santiago Pastorino | 2011-07-15 | 1 | -2/+2 | |
| |\ \ \ | |/ / |/| | | Fix wildcard route code example in changelog | |||||
| | * | | Fix wildcard route code example in changelog. | Hendy Tanata | 2011-07-16 | 1 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #2073 from bfolkens/master | Santiago Pastorino | 2011-07-14 | 1 | -0/+5 | |
| |\ \ | | | | | | | ported test from pull request #2071 to master | |||||
| | * | | assert nothing raised for setting a cookie value to nil in ActionDispatch | Bradford Folkens | 2011-07-14 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | Merge pull request #2063 from elight/master | Santiago Pastorino | 2011-07-14 | 2 | -3/+29 | |
| |\ \ \ | | | | | | | | | Patch for https://github.com/rails/rails/issues/2059 | |||||
| | * | | | Fix and unit test for https://github.com/rails/rails/issues/2059 | Evan Light | 2011-07-14 | 2 | -3/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | Merge pull request #1807 from caius/find_in_batches_id_bug | Santiago Pastorino | 2011-07-14 | 2 | -2/+21 | |
| |\ \ \ \ | |_|/ / |/| | | | Bugfix by stopping find_in_batches using the records after yielding. | |||||
| | * | | | Stop find_in_batches using the records after yielding. | Caius Durling | 2011-06-21 | 2 | -2/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the code that calls .find_in_batches modifies the yielded array in place then .find_in_batches can enter an infinite loop searching with ruby object ids in the database instead of the primary key of records in the database. This happens because it naively assumes the yielded array hasn't been modified before calling #id on the last object in the array. And ruby (1.8 at least) alias' #id to #object_id so an integer is still returned no matter what the last object is. By moving finding the #id of the last object before yielding the array it means the calling code can do whatever it wants to the array in terms of modifying it in place, and .find_in_batches doesn't care. | |||||
| * | | | | Merge pull request #2066 from amatsuda/magicome | Aaron Patterson | 2011-07-14 | 2 | -0/+4 | |
| |\ \ \ \ | |_|/ / |/| | | | missing magic comments | |||||
| | * | | | need magic comments | Akira Matsuda | 2011-07-14 | 2 | -0/+4 | |
| |/ / / | ||||||
| * | | | Merge pull request #2052 from amatsuda/fullwidth_blank | Aaron Patterson | 2011-07-13 | 2 | -2/+6 | |
| |\ \ \ | | | | | | | | | treat fullwidth whitespace as a blank character | |||||
| | * | | | treat fullwidth whitespace as a blank character | Akira Matsuda | 2011-07-14 | 2 | -2/+6 | |
| | | |/ | |/| | ||||||
| * / | | Bump rack up | Santiago Pastorino | 2011-07-13 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Use cache/assets instead. | José Valim | 2011-07-12 | 4 | -5/+4 | |
| | | | ||||||
| * | | assets.cache_store now defaults to filesystem. You will want to share ↵ | José Valim | 2011-07-12 | 6 | -16/+9 | |
| | | | | | | | | | tmp/assets_cache between deploys. | |||||
| * | | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patch | Santiago Pastorino | 2011-07-12 | 1 | -7/+13 | |
| |\ \ | | | | | | | Fix for SqlBypass session store (for master) | |||||
| | * | | Fix for SqlBypass session store | Joseph Wong | 2011-07-12 | 1 | -7/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test | Santiago Pastorino | 2011-07-12 | 2 | -2/+37 | |
| |\ \ \ | | | | | | | | | Fixed session ID fixation for ActiveRecord::SessionStore (for master) | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |