aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #28913 from prathamesh-sonpatki/fix-indentRafael França2017-04-271-22/+22
|\
| * Fix indentation [ci skip]Prathamesh Sonpatki2017-04-271-22/+22
|/
* Merge pull request #28911 from prathamesh-sonpatki/ar-release-notesRafael França2017-04-271-2/+74
|\
| * Added some more release notes for Active Record [ci skip]Prathamesh Sonpatki2017-04-271-2/+74
|/
* Merge pull request #20701 from iamvery/date-helper-argument-errorAndrew White2017-04-273-18/+41
|\
| * Ensure input to distance_of_time_in_words is not nilJay Hayes2017-04-273-18/+41
* | Merge pull request #28844 from kyuden/remove_unnecessary_attributes_of_select...Kasper Timm Hansen2017-04-272-1/+3
|\ \
| * | Remove unnecessary `skip_default_ids` and `allow_method_names_outside_object`...kyuden2017-04-242-1/+3
* | | Merge pull request #28904 from robin850/update-working-with-javascriptRafael Mendonça França2017-04-271-35/+147
|\ \ \
| * | | Add documentation of data attributes for UJS [ci skip]Robin Dupret2017-04-271-1/+97
| * | | Nest Action View remote helpers one level deeper [ci skip]Robin Dupret2017-04-271-3/+5
| * | | Add a section with the different Ajax events [ci skip]Robin Dupret2017-04-271-0/+36
| * | | Update the JavaScript guide to use `form_with`Robin Dupret2017-04-271-29/+7
* | | | Also raise error when VERSION is nilRafael Mendonça França2017-04-273-3/+10
* | | | Merge pull request #28906 from georgeclaghorn/fix-belongs-to-default-with-lambdaRafael França2017-04-272-1/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Evaluate belongs_to :default option against the owner, not the associationGeorge Claghorn2017-04-272-1/+19
|/ / /
* | | Merge pull request #28899 from kamipo/restore_fixture_author_addressesRafael França2017-04-2721-26/+26
|\ \ \
| * | | Restore `fixtures :author_addresses`Ryuta Kamizono2017-04-2721-26/+26
* | | | Merge pull request #28896 from pschambacher/load_with_sharedRafael França2017-04-263-4/+49
|\ \ \ \ | |/ / / |/| | |
| * | | Added a shared section to config/database.yml that will be loaded for all env...Pierre Schambacher2017-04-263-4/+49
* | | | Merge pull request #28883 from yahonda/fix28797Rafael França2017-04-262-3/+8
|\ \ \ \
| * | | | PostgreSQL 10 allows `CURRENT_DATE` and `CURRENT_TIMESTAMP` as default functionsYasuo Honda2017-04-262-3/+8
* | | | | Merge pull request #28848 from Edouard-chin/ec-remove-unused-methodRafael França2017-04-261-7/+0
|\ \ \ \ \
| * | | | | `sort_query_string_params` method is no more usedEdouard CHIN2017-04-231-7/+0
* | | | | | Merge pull request #28897 from rafaelfranca/fix-name-error-error-pageAaron Patterson2017-04-262-1/+21
|\ \ \ \ \ \
| * | | | | | Do not try to encoding the parameters when the controller is not definedRafael Mendonça França2017-04-262-1/+21
* | | | | | | Merge pull request #28881 from bogdanvlviv/verbose-migrationRafael França2017-04-262-2/+17
|\ \ \ \ \ \ \
| * | | | | | | Refactor DatabaseTasksMigrateTest#test_migrate_receives_correct_env_varsbogdanvlviv2017-04-261-1/+16
| * | | | | | | Refactor AR::Tasks::DatabaseTasks::migratebogdanvlviv2017-04-261-1/+1
* | | | | | | | Merge pull request #28244 from ixti/improve/action-mailer-preview-paramsRafael França2017-04-265-6/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass request params to ActionMailer::PreviewAlexey Zapparov2017-03-015-6/+85
* | | | | | | | | Merge pull request #28885 from kamipo/remove_useless_test_caseRafael França2017-04-262-13/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove useless test caseRyuta Kamizono2017-04-262-13/+0
* | | | | | | | | | Merge pull request #28847 from Edouard-chin/current-page-checkquery-stringRafael França2017-04-262-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `current_page?` regression:Edouard CHIN2017-04-262-1/+19
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #28891 from sodabrew/patch-1Rafael França2017-04-261-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Remove mysql2 database adapter default username rootAaron Stone2017-04-261-2/+0
* | | | | | | | | | Pluralize methodsJon Moss2017-04-261-1/+1
* | | | | | | | | | More release notes for Rails 5.1 [ci skip]claudiob2017-04-261-0/+30
* | | | | | | | | | Merge pull request #28894 from robin850/5-1-notes-fixesClaudio B2017-04-261-28/+86
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Add some items to the release notes [ci skip]Robin Dupret2017-04-271-0/+54
| * | | | | | | | | Some improvements in the 5.1 release notes [ci skip]Robin Dupret2017-04-271-28/+32
|/ / / / / / / / /
* / / / / / / / / Revert "Merge pull request #27636 from mtsmfm/disable-referential-integrity-w...Rafael Mendonça França2017-04-2625-185/+98
|/ / / / / / / /
* | | | / / / / Lock connection before checking it inMatthew Draper2017-04-261-6/+8
| |_|_|/ / / / |/| | | | | |
* | | | | | | s/broadcasing/broadcasting/Akira Matsuda2017-04-271-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #28839 from y-yagi/fix-yarn-exit-statusRafael França2017-04-251-2/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Ensure bin/yarn matches the one generated by webpackeryuuji.yaginuma2017-04-231-2/+3
| | |_|/ / | |/| | |
* | | | | Describe the changes in transactional testsMatthew Draper2017-04-251-0/+31
* | | | | Merge pull request #28828 from kamipo/fix_extending_modules_on_associationRafael França2017-04-253-10/+25
|\ \ \ \ \
| * | | | | Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`Ryuta Kamizono2017-04-223-10/+25