aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Fix the buildSantiago Pastorino2012-05-224-3/+1
* | | | | | Merge pull request #6440 from gaurish/route_move_topJeremy Kemper2012-05-221-3/+4
|\ \ \ \ \ \
| * | | | | | Move root method at TOP of routes fileGaurish Sharma2012-05-221-3/+4
* | | | | | | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-225-1/+4
* | | | | | | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-222-10/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-222-10/+61
* | | | | | | Merge pull request #6439 from janx/remove_useless_requireJosé Valim2012-05-222-1/+1
|\ \ \ \ \ \ \
| * | | | | | | refactor lazy_load_hooks load positionJan Xie2012-05-222-1/+1
* | | | | | | | Merge pull request #6437 from avakhov/gen-gem-methodJosé Valim2012-05-224-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Use new hash syntax for generators gem methodAlexey Vakhov2012-05-224-4/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #6435 from janx/remove_useless_requirePiotr Sarnacki2012-05-221-1/+0
|\| | | | | | |
| * | | | | | | remove useless requireJan Xie2012-05-221-1/+0
| | |/ / / / / | |/| | | | |
* / | | | | | Use require_dependency in generated controllersPiotr Sarnacki2012-05-223-4/+4
|/ / / / / /
* | | | | | Merge pull request #6150 from avakhov/dbconsole-fixesPiotr Sarnacki2012-05-214-10/+38
|\ \ \ \ \ \
| * | | | | | Fix `rails db -h` and cosmetic fixes in usage bannersAlexey Vakhov2012-05-224-3/+26
| * | | | | | Use relative path to sqlite3 db in `rails db` commandAlexey Vakhov2012-05-222-7/+12
|/ / / / / /
* | | | | | Merge pull request #6420 from chancancode/master_restore_frozen_state_on_roll...Piotr Sarnacki2012-05-212-1/+13
|\ \ \ \ \ \
| * | | | | | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-212-1/+13
* | | | | | | Merge pull request #5125 from winston/log_exception_when_cache_read_failsMichael Koziarski2012-05-212-1/+11
|\ \ \ \ \ \ \
| * | | | | | | #read_entry in ActiveSupport::Cache::FileStore should log details of the exce...Winston2012-02-222-1/+11
* | | | | | | | using __method__ for the command method callsAaron Patterson2012-05-212-5/+64
* | | | | | | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-212-1/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-212-1/+8
* | | | | | | | Remove not used variables from connection poll testCarlos Antonio da Silva2012-05-211-2/+2
* | | | | | | | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-212-5/+3
* | | | | | | | Merge pull request #5156 from avakhov/class-attribute-instance-accessorCarlos Antonio da Silva2012-05-214-4/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add instance_accessor option to class_attributeAlexey Vakhov2012-05-224-4/+14
|/ / / / / / /
* | | | | | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-212-72/+23
* | | | | | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-212-23/+72
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| * | | | | | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
* | | | | | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-212-3/+17
|\ \ \ \ \ \ \
| * | | | | | | When a route references a missing controller, raise ActionController::Routing...Trek Glowacki2011-08-162-3/+17
* | | | | | | | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-213-35/+202
|\ \ \ \ \ \ \ \
| * | | | | | | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-203-35/+202
* | | | | | | | | Merge pull request #6143 from senny/composed_of_converter_returns_nilAaron Patterson2012-05-213-7/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow the :converter Proc form composed_of to return nilYves Senn2012-05-033-7/+31
* | | | | | | | | | Merge pull request #6424 from avakarev/refactoring_unless-elseJeremy Kemper2012-05-211-9/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactoring: turn unless/else into if/elseAndrey Vakarev2012-05-211-9/+9
|/ / / / / / / / / /
* | / / / / / / / / More info on commit messages in contributing guidePiotr Sarnacki2012-05-211-1/+31
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-204-5/+24
* | | | | | | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
* | | | | | | | | Fix CHANGELOG order and add a brief description of the changes in theRafael Mendonça França2012-05-202-3/+7
* | | | | | | | | Merge pull request #6408 from ivankukobko/masterCarlos Antonio da Silva2012-05-201-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed typo in word finidingIvan Kukobko2012-05-201-1/+1
|/ / / / / / / / /
* | | | | | | | | Revert "Merge pull request #5702 from oscardelben/patch-4"Piotr Sarnacki2012-05-201-1/+3
* | | | | | | | | Escape the extension when normalizing the action cache path.Andrew White2012-05-202-3/+33
* | | | | | | | | Return 400 Bad Request for URL paths with invalid encoding.Andrew White2012-05-204-0/+51
* | | | | | | | | Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-208-6/+47
* | | | | | | | | Correct order of expected and actual argumentsAndrew White2012-05-201-1/+1