aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
* 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
| * | | a rails application should be an engine subclassAaron Patterson2014-08-051-1/+1
| * | | no reason to lazily instantiate the routesAaron Patterson2014-08-051-45/+42
* | | | Stop using padding in the generated Gemfile -- it looks shitDavid Heinemeier Hansson2014-08-072-6/+1
|/ / /
* | | Merge pull request #16364 from arthurnn/make_transaction_one_classJeremy Kemper2014-08-052-72/+56
|\ \ \
| * | | Cleanup Transaction inheritance.Arthur Neves2014-08-052-72/+56
* | | | just assign the instance variables on the testAaron Patterson2014-08-051-7/+3
* | | | We don't need parenthesis for thisGuillermo Iguaran2014-08-051-1/+1
* | | | Merge pull request #16405 from arthurnn/fix_digest_etag_testGuillermo Iguaran2014-08-051-1/+1
|\ \ \ \
| * | | | Fix digest ETAG test.Arthur Neves2014-08-051-1/+1
|/ / / /
* | | | Merge pull request #16404 from bogdan/move-create-with-bangCarlos Antonio da Silva2014-08-052-15/+12
|\ \ \ \
| * | | | Moved #create! method from Validations to Persistence moduleBogdan Gusiev2014-08-052-15/+12
| | |_|/ | |/| |
* | | | Fix AS docs / changelog with wrong method [ci skip]Carlos Antonio da Silva2014-08-052-3/+3
* | | | Bring back the helpers testsJosé Valim2014-08-053-0/+50