aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* save a hash allocation per request.Aaron Patterson2014-08-081-1/+1
* add a test for prepending SCRIPT_NAME to generated urlsAaron Patterson2014-08-081-0/+88
* Merge pull request #16429 from arunagw/aa-build-fix-gemfile-springSantiago Pastorino2014-08-083-8/+13
|\
| * Fixes test for Gemfile entry changesArun Agrawal2014-08-083-8/+13
* | Merge pull request #16427 from ryandao/full_stack_source_extractGuillermo Iguaran2014-08-089-69/+114
|\ \
| * | Update actionpack CHANGELOGRyan Dao2014-08-081-0/+5
| * | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| |/
* | Merge pull request #16426 from tgxworld/fix_false_positiveSantiago Pastorino2014-08-081-4/+5
|\ \
| * | Fixes to TestCaseTest.Guo Xiang Tan2014-08-081-4/+5
| |/
* | Fix the #const_regexp's documentation [ci skip]Robin Dupret2014-08-081-3/+4
* | Merge pull request #16430 from guillermo/patch-1Rafael Mendonça França2014-08-081-1/+1
|\ \
| * | Fix typo in plugins docGuillermo Álvarez Fernández2014-08-081-1/+1
|/ /
* | Merge pull request #16428 from tomkadwill/activerecord_associations_name_paramCarlos Antonio da Silva2014-08-081-4/+4
|\ \ | |/ |/|
| * [ci skip] Changed 'first argument' to '+name+ argument'Tom Kadwill2014-08-081-4/+4
|/
* Rephrase how we explain RecordInvalid exception in the context ofZachary Scott2014-08-071-3/+5
* Merge pull request #16384 from tomkadwill/improved_create_documentationZachary Scott2014-08-071-2/+5
|\
| * [ci skip] Updated create! documentation description and added +attributes+ fo...Tom Kadwill2014-08-071-2/+5
* | Pull spring gem entry into the Gemfile template instead of gemfile_entries so...David Heinemeier Hansson2014-08-072-10/+12
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-0737-207/+400
|\ \
| * | need to call superAaron Patterson2014-08-071-0/+1
| * | add a new constructor that runs load hooksAaron Patterson2014-08-072-5/+9
| * | defer running after_config hooks until after the object is allocatedAaron Patterson2014-08-071-7/+22
| * | Merge pull request #16424 from gregors/remove_dead_codeRafael Mendonça França2014-08-071-36/+0
| |\ \
| | * | remove dead file_watcher codeGregory Ostermayr2014-08-071-36/+0
| * | | use the uri parser so that newer version of Ruby workAaron Patterson2014-08-071-1/+1
| |/ /
| * | Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtablesAaron Patterson2014-08-071-0/+7
| |\ \
| | * | change to empty? from blank?tsukasaoishi2014-08-081-1/+1
| | * | Tables existence check query is executed in large quantitiestsukasaoishi2014-08-071-0/+7
| * | | Merge pull request #16422 from tgxworld/fix_spellingYves Senn2014-08-071-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix spelling.Guo Xiang Tan2014-08-071-1/+1
| |/ /
| * | Fix typo [ci skip]Carlos Antonio da Silva2014-08-071-1/+1
| * | Merge pull request #16412 from yevhene/masterSantiago Pastorino2014-08-073-2/+18
| |\ \
| | * | Allow password to contain spaces only.Yevhene Shemet2014-08-063-2/+18
| * | | Merge pull request #16419 from tgxworld/remove_legacy_codeSantiago Pastorino2014-08-071-34/+0
| |\ \ \
| | * | | Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| |/ / /
| * | | Define id_was to get the previous value of the primary keyRafael Mendonça França2014-08-063-1/+28
| * | | Test using turbolinks masterRafael Mendonça França2014-08-061-1/+1
| * | | Fix DateTime comparison with DateTime::Infinity objectRafael Mendonça França2014-08-063-1/+8
| * | | lazily instantiate application subclassesAaron Patterson2014-08-063-4/+18
| * | | refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-062-10/+7
| | |/ | |/|
| * | defined? should actually work in current implementationAkira Matsuda2014-08-071-9/+0
| |/
| * Merge pull request #16402 from bogdan/select_with_empty_blockSantiago Pastorino2014-08-062-1/+14
| |\
| | * Fixed #select form builder helper to support block with html outputBogdan Gusiev2014-08-052-1/+14
| * | Merge pull request #16359 from skanev/after-bundle-in-rails-templatesYves Senn2014-08-067-3/+95
| |\ \
| | * | Add after_bundle to the release notes and upgrade guideStefan Kanev2014-08-052-0/+35
| | * | Add an after_bundle callback in Rails templatesStefan Kanev2014-08-035-3/+60
| * | | Merge pull request #16316 from rails/senny/purge_schema_maintenanceYves Senn2014-08-066-14/+133
| |\ \ \
| | * | | schema rake tasks are specific about the configuration to act on.Yves Senn2014-08-064-22/+39
| | * | | Revert "Revert "Merge pull request #15394 from morgoth/fix-automatic-maintain...Yves Senn2014-08-064-3/+105
| |/ / /
| * | | call the routes method on enginesAaron Patterson2014-08-051-74/+37