aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #28753 from st0012/add-render-with-variants-testKasper Timm Hansen2017-05-013-0/+10
|\
| * Add tests for render template/partial with variants option.Stan Lo2017-04-143-0/+10
* | Merge pull request #28939 from kirs/maintain_test_schema_friendlyAndrew White2017-05-011-1/+6
|\ \
| * | Friendly maintain schema failureKir Shatrov2017-04-301-1/+6
* | | Merge pull request #28944 from alexcameron89/update_templatesRafael França2017-05-015-5/+5
|\ \ \
| * | | Update the Gem Bug Report Templates to 5.1.0Alex Kitchens2017-05-015-5/+5
| |/ /
* | | Merge pull request #28941 from y-yagi/remove_needless_remove_fileRafael França2017-05-011-4/+0
|\ \ \ | |/ / |/| |
| * | Remove unnecessary `package.json` deletionyuuji.yaginuma2017-05-011-4/+0
* | | Remove `:doc:` in `:nodoc:` class [ci skip]Ryuta Kamizono2017-05-011-2/+2
* | | Add periodJon Moss2017-04-301-1/+1
* | | Merge pull request #28936 from dixpac/dixpac/update-docs-ActionDispatch__Jour...Jon Moss2017-04-301-0/+4
|\ \ \
| * | | Add docs for Router::Utils.unescape_uri methoddixpac2017-04-301-0/+4
|/ / /
* | | Merge pull request #28934 from y-yagi/fix-note-about-secretsRyuta Kamizono2017-04-301-3/+3
|\ \ \ | |/ / |/| |
| * | Fix note about `secrets.yml` [ci skip]yuuji.yaginuma2017-04-301-3/+3
|/ /
* | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-308-25/+29
* | Merge pull request #28924 from y-yagi/fix-release-noteRafael França2017-04-291-10/+0
|\ \
| * | Remove entries included in 5.0 [ci skip]yuuji.yaginuma2017-04-291-10/+0
* | | Merge pull request #28923 from maclover7/jm-structRafael França2017-04-281-23/+15
|\ \ \ | |/ / |/| |
| * | Stop creating duplicate Struct instancesJon Moss2017-04-281-23/+15
|/ /
* | Merge pull request #28920 from eugeneius/require_remove_methodRafael França2017-04-281-0/+1
|\ \
| * | Add missing require for `remove_possible_method`Eugene Kenny2017-04-281-0/+1
|/ /
* | 5.1 Release Notes are complete [ci skip]claudiob2017-04-281-1/+0
* | Small grammar fixJon Moss2017-04-271-1/+1
* | Small grammar fixJon Moss2017-04-271-1/+1
* | Small grammar fixesJon Moss2017-04-271-13/+13
* | 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
|\ \ \ \ \ \ \