aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #28191 from eugeneius/string_assoc_orderRafael França2017-03-172-2/+30
|\
| * Allow order to be given expressions as hash keysEugene Kenny2017-02-272-2/+30
* | Merge pull request #28154 from aripollak/remove-comments-from-structure-sqlRafael Mendonça França2017-03-173-3/+43
|\ \
| * | Only remove comments before the first statementAri Pollak2017-02-242-7/+12
| * | Drop comments from structure.sql in postgresqlAri Pollak2017-02-243-3/+38
* | | Fix resolve usage in the release notesRafael Mendonça França2017-03-171-1/+1
* | | Merge pull request #28096 from prathamesh-sonpatki/5-1-release-notes-first-draftRafael França2017-03-171-0/+267
|\ \ \
| * | | Add blurbs about each new feature [ci skip]Prathamesh Sonpatki2017-03-131-0/+158
| * | | Add PR links for major features [ci skip]Prathamesh Sonpatki2017-03-031-0/+11
| * | | Add first draft of release notes for Rails 5.1 :tada:Prathamesh Sonpatki2017-03-031-0/+98
* | | | uniq was deprecated and removed alreadyRafael Mendonça França2017-03-171-1/+1
* | | | Add support for calling nested direct routes (#28462)Andrew White2017-03-174-32/+48
* | | | Merge pull request #28341 from mtsmfm/pass-options-to-driven-byRafael França2017-03-173-4/+6
|\ \ \ \
| * | | | Pass options to `driven_by`Fumiaki MATSUSHIMA2017-03-133-4/+6
* | | | | Merge pull request #28318 from bogdanvlviv/remove-ability-update-locking_colu...Rafael França2017-03-175-49/+4
|\ \ \ \ \
| * | | | | Remove ability update locking_column valuebogdanvlviv2017-03-165-49/+4
* | | | | | Add :default option to belongs_to (#28453)George Claghorn2017-03-175-1/+50
* | | | | | Bump Capybara and include Minitest::Assertionseileencodes2017-03-174-4/+6
* | | | | | Cleanup documentation fixes (#28460)Vipul A M2017-03-172-5/+5
* | | | | | Merge pull request #28421 from tangposmarvin/docs-assest-pipelineVipul A M2017-03-171-1/+1
|\ \ \ \ \ \
| * | | | | | Fix asset_pipeline docs incorrect image dir infomarvin2017-03-161-1/+1
* | | | | | | Merge pull request #28444 from budnik/patch-2Vipul A M2017-03-171-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Updates incorrect documentation [ci skip]Dmitriy Budnik2017-03-161-4/+3
* | | | | | | | Merge pull request #28445 from denniszelada/feature-documentation-with_optionsVipul A M2017-03-171-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add documentation to use with_options in the same class [ci skip]Dennis Zelada2017-03-161-0/+11
* | | | | | | | Fix test warningsAndrew White2017-03-161-5/+5
* | | | | | | | Move `to_time` to `DateTime` compatibility.rb fileAndrew White2017-03-164-6/+16
* | | | | | | | Merge pull request #28147 from kmcphillips/master-time-freezeAndrew White2017-03-166-22/+206
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Handle #to_time and memoization taking into account memoization, frozen state...Kevin McPhillips2017-03-066-22/+206
* | | | | | | | Merge pull request #28368 from y-yagi/add_test_for_secrets_commandKasper Timm Hansen2017-03-151-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add secrets edit testyuuji.yaginuma2017-03-121-0/+13
* | | | | | | | | Tweak 28412Jon Moss2017-03-151-1/+1
* | | | | | | | | Remove unnecessary params mungingAndrew White2017-03-152-2/+62
* | | | | | | | | Revert #27850 following test breakage (#28427)David Heinemeier Hansson2017-03-153-19/+7
* | | | | | | | | Merge pull request #28426 from mtsmfm/fix-fragile-testRafael França2017-03-151-36/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix fragile test (`AssociationProxyTest#test_save_on_parent_saves_children`)Fumiaki MATSUSHIMA2017-03-161-36/+34
* | | | | | | | | | Merge pull request #28425 from rails/remove-duration-deprecationAndrew White2017-03-155-38/+214
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Restore 5.minutes changed in #28204Andrew White2017-03-151-1/+1
| * | | | | | | | | | Use better duration aliases in testsAndrew White2017-03-151-2/+2
| * | | | | | | | | | Remove implicit coercion deprecation of durationsAndrew White2017-03-153-35/+211
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #28412 from benoittgt/add_doc_for_message_encryptor_newRafael França2017-03-151-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add documentation about signature_key for MessageEncryptor.new [ci skip]Benoit Tigeot2017-03-151-0/+5
* | | | | | | | | | Merge pull request #28423 from eugeneius/rm_txnRichard Schneeman2017-03-152-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused `@txn` variableEugene Kenny2017-03-152-2/+0
* | | | | | | | | | | Merge pull request #28409 from y-yagi/make_destroy_command_work_within_enginesEileen M. Uchitelle2017-03-152-2/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make destroy command work within enginesyuuji.yaginuma2017-03-142-2/+57
* | | | | | | | | | | | Merge pull request #28422 from y-yagi/rename_app_update_test_to_more_appropri...Kasper Timm Hansen2017-03-151-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Rename test of `app:update` to more appropriate nameyuuji.yaginuma2017-03-151-7/+7
| |/ / / / / / / / / /
* | | | | | / / / / / Don't cast to float unnecessarilyAndrew White2017-03-151-2/+2
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #28420 from claudiob/changelog-skip-coffeeClaudio B2017-03-141-0/+4
|\ \ \ \ \ \ \ \ \ \