aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #28814 from halfbyte/fix_error_pages_for_turbolinksRafael França2017-04-204-18/+25
|\
| * Namespace CSS selectors on error pagesJan Krutisch2017-04-204-18/+25
|/
* Merge pull request #28807 from oiorain/oiorain-callbackChain-commentKasper Timm Hansen2017-04-201-1/+0
|\
| * Remove outdated commentMarion Bouguet2017-04-201-1/+0
|/
* Merge pull request #28733 from kamipo/dont_fallback_to_utf8mb3_after_mysql_8.0.0Rafael França2017-04-193-10/+12
|\
| * Don't fallback to utf8mb3 after MySQL 8.0.0Ryuta Kamizono2017-04-173-10/+12
* | Merge pull request #28776 from kamipo/respect_limit_for_cache_keyRafael França2017-04-192-8/+44
|\ \
| * | `cache_key` respects the limit in a relation even if a relation is not loadedRyuta Kamizono2017-04-172-8/+44
| |/
* | Merge pull request #28708 from y-yagi/dont_generate_system_test_filesRafael França2017-04-192-0/+15
|\ \
| * | Don't generate system test files if `skip_system_test` option is specifiedyuuji.yaginuma2017-04-122-0/+15
* | | Fix all style guides violationsRafael Mendonça França2017-04-1919-33/+33
* | | Use released sass-rails instead of master versionRafael Mendonça França2017-04-191-1/+1
* | | Merge pull request #28757 from edwardmp/log-actioncable-write-read-errorsRafael França2017-04-192-1/+8
|\ \ \
| * | | Log any errors originating from the socketedwardmp2017-04-162-1/+8
* | | | Merge pull request #28166 from bogdanvlviv/fix_migration_tasksRafael França2017-04-193-6/+78
|\ \ \ \
| * | | | Add additional raise UnknownMigrationVersionErrorbogdanvlviv2017-04-193-6/+43
| * | | | Fix `bin/rails db:forward` first migrationbogdanvlviv2017-04-193-1/+36
* | | | | Merge pull request #28800 from Shopify/deprecation_includes_gem_name_and_versionRafael França2017-04-195-16/+56
|\ \ \ \ \
| * | | | | Send deprecation horizon and gem name as arguments to deprecation heavier han...Willem van Bergen2017-04-195-16/+56
| |/ / / /
* | | | | Merge pull request #28734 from rafaelfranca/strong-parametersRafael França2017-04-1912-91/+168
|\ \ \ \ \
| * | | | | Reuse the Parameters#to_h check in the routing helpersRafael Mendonça França2017-04-1810-39/+18
| * | | | | Follow the style guide rules in the documetationRafael Mendonça França2017-04-181-30/+30
| * | | | | Improve documentationRafael Mendonça França2017-04-181-4/+4
| * | | | | Implement ActionController::Parameters#to_query and #to_paramRafael Mendonça França2017-04-182-5/+49
| * | | | | Use the right assetions to better error messagesRafael Mendonça França2017-04-181-7/+7
| * | | | | Add test to make sure that to_unsafe_h don't mutate the targetRafael Mendonça França2017-04-181-0/+10
| * | | | | Add ActionController::Parameters#to_hash to implict conversionRafael Mendonça França2017-04-182-0/+42
| * | | | | Raise exception when calling to_h in a unfiltered ParametersRafael Mendonça França2017-04-182-17/+19
| * | | | | Test the correct objectRafael Mendonça França2017-04-181-1/+1
* | | | | | Reword sentenceJon Moss2017-04-191-3/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-04-191-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Change ++ by markdown quotesMikhail Dieterle2017-04-081-1/+1
* | | | | | Merge pull request #28794 from vishalzambre/activerecord-guidRafael França2017-04-191-5/+5
|\ \ \ \ \ \
| * | | | | | [ci skip] Changed plain text to NOTE.vishalzambre2017-04-191-5/+5
* | | | | | | Merge pull request #28793 from kamipo/use_quoted_scope_to_respect_current_dat...Andrew White2017-04-191-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix `extract_expression_for_virtual_column` for MariaDBRyuta Kamizono2017-04-191-1/+1
| * | | | | | Use `quoted_scope` rather than `@config[:database]` to respect current databaseRyuta Kamizono2017-04-191-2/+3
|/ / / / / /
* | | | | | Merge pull request #28791 from y-yagi/date_time_fields_from_listRafael França2017-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | Remove datetime fields from helper list [ci skip]yuuji.yaginuma2017-04-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #28161 from bogdanvlviv/add_test_attributesRafael França2017-04-181-0/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add test for method `#attributes`bogdanvlviv2017-02-251-0/+11
* | | | | | Merge pull request #28790 from tjschuck/require_as_time_in_testing_time_helpersRafael França2017-04-181-0/+1
|\ \ \ \ \ \
| * | | | | | Explicitly require AS::Time in AS::Testing::TimeHelpersT.J. Schuck2017-04-181-0/+1
* | | | | | | Merge pull request #28781 from mtsmfm/sumRafael França2017-04-181-23/+45
|\ \ \ \ \ \ \
| * | | | | | | Fix Enumerable#sum redefined warningFumiaki MATSUSHIMA2017-04-181-23/+45
| |/ / / / / /
* | | | | | | Revert "Merge pull request #28788 from tjschuck/require_as_notifications_in_c...Rafael Mendonça França2017-04-181-1/+0
* | | | | | | Merge pull request #28788 from tjschuck/require_as_notifications_in_cacheAndrew White2017-04-181-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Explicitly require AS::Notifications in AS::CacheT.J. Schuck2017-04-171-0/+1
* | | | | | | Use more specific check for :format in route pathAndrew White2017-04-182-1/+20
* | | | | | | Add missing periodsJon Moss2017-04-171-2/+2