aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6277 from homakov/patch-6José Valim2012-05-121-0/+3
|\
| * Update railties/lib/rails/generators/rails/app/templates/config/application.rbEgor Homakov2012-05-121-0/+3
* | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
* | Remove wrong rack/utils dependency from ASSantiago Pastorino2012-05-121-3/+3
* | Merge pull request #6281 from acapilleri/mispelling_errors_in_render_text_testVijay Dev2012-05-122-3/+3
|\ \
| * | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-122-3/+3
* | | Merge pull request #6278 from GRoguelon/masterVijay Dev2012-05-122-2/+2
|\ \ \
| * | | Add commas missing in performance testsGeoffrey Roguelon2012-05-122-2/+2
| | |/ | |/|
* | | Merge pull request #6280 from nashby/private-tryJon Leighton2012-05-123-3/+17
|\ \ \ | |_|/ |/| |
| * | Object#try can't call private methodsVasiliy Ermolovich2012-05-123-3/+17
| |/
* | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \
| * | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
* | | Merge pull request #6279 from acapilleri/mispelling_error_in_actionpach_chang...Xavier Noria2012-05-121-1/+1
|\ \ \ | |_|/ |/| |
| * | mispelling error in actionpach changelogangelo giovanni capilleri2012-05-121-1/+1
|/ /
* | Remove #=== quirkJon Leighton2012-05-113-17/+0
* | Add test directory to TestTask's libsSantiago Pastorino2012-05-111-0/+1
* | Remove useless load path modificationsSantiago Pastorino2012-05-1112-38/+4
* | Lazy load I18nSantiago Pastorino2012-05-114-6/+10
* | Move require to where it's neededSantiago Pastorino2012-05-116-3/+6
* | Remove ruby/shimSantiago Pastorino2012-05-113-17/+1
* | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
* | extract deprecated codeJon Leighton2012-05-111-8/+1
* | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
* | CollectionProxy < RelationJon Leighton2012-05-1111-60/+79
* | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect collection-t...Jon Leighton2012-05-114-3/+40
* | Merge pull request #6269 from edtsech/hash-except-testXavier Noria2012-05-111-0/+6
|\ \
| * | Test Hash#except can receive more than one argument.Edward Tsech2012-05-111-0/+6
* | | Merge pull request #6268 from carlesso/masterJosé Valim2012-05-112-2/+2
|\ \ \ | |/ / |/| |
| * | In robots.txt, User-agent should be all downcase except for the first 'U', ac...Enrico Carlesso2012-05-112-2/+2
|/ /
* | Copy literal route constraints to defaults - fixes #3571 and #6224.Andrew White2012-05-114-3/+69
* | Fixes issue #6251David Padilla2012-05-101-1/+1
* | Failing test for #6251Piotr Sarnacki2012-05-101-0/+7
* | Return false for exists? with new records - fixes #6199.Andrew White2012-05-103-2/+3
* | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+36
* | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
* | remove unnecessary 'examples' noise [ci skip]Vijay Dev2012-05-112-28/+18
* | Merge pull request #6253 from rafmagana/masterJosé Valim2012-05-101-1/+1
|\ \
| * | remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_ac...Rafael Magana2012-05-101-1/+1
* | | Merge pull request #6252 from grosser/unless_exist_for_memory_storeJosé Valim2012-05-102-0/+8
|\ \ \ | |/ / |/| |
| * | add unless_exist option to memory storegrosser2012-05-102-0/+8
|/ /
* | Merge pull request #6244 from frodsan/fix_build_remove_keyJosé Valim2012-05-101-1/+1
|\ \
| * | Remove key argument from run_callbacks to fix buildFrancesco Rodriguez2012-05-101-1/+1
|/ /
* | Merge pull request #6242 from frodsan/fix_abstract_controllerJosé Valim2012-05-101-1/+1
|\ \
| * | removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
|/ /
* | Merge pull request #6241 from frodsan/deprecate_key_callbacksJosé Valim2012-05-104-6/+7
|\ \
| * | AS::Callbacks#run_callbacks remove key argumentFrancesco Rodriguez2012-05-104-6/+7
|/ /
* | Merge pull request #4254 from alexeymuranov/my-nicify-fixtures-rbJeremy Kemper2012-05-092-81/+82
|\ \
| * | Rename some variablesAlexey Muranov2012-05-092-78/+82
| * | Remove unused private method in fixtures.rbAlexey Muranov2012-05-091-3/+0
| * | Remove unused parameter in ::instantiate_fixturesAlexey Muranov2012-05-091-5/+5