aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix numericality validator to still use value before type cast except Active ...Ryuta Kamizono2018-08-244-4/+41
* Merge pull request #33703 from bogdanvlviv/follow-up-33659George Claghorn2018-08-235-6/+17
|\
| * DRY in `assert_broadcasts`bogdanvlviv2018-08-232-2/+13
| * Simplify configuring of `ActionCable.server.config.logger` for actioncable testsbogdanvlviv2018-08-231-1/+1
| * Set the test adapter for the test environment by default in `config/cable.yml`bogdanvlviv2018-08-231-1/+1
| * Clarify api docs of ActionCable::SubscriptionAdapter::Testbogdanvlviv2018-08-232-2/+2
* | Fix typo s/Topic/Tag/Ryuta Kamizono2018-08-231-1/+1
* | Merge pull request #33704 from matthewd/helper-path-with-sizeMatthew Draper2018-08-231-2/+1
|\ \
| * | Use string lengths instead of regexp to extract pathMatthew Draper2018-08-231-2/+1
* | | Merge pull request #32647 from eugeneius/lazy_transactionsMatthew Draper2018-08-2317-17/+185
|\ \ \
| * | | Omit BEGIN/COMMIT statements for empty transactionsEugene Kenny2018-08-1317-17/+185
* | | | Merge pull request #33696 from bogdanvlviv/follow-up-44007c070Kasper Timm Hansen2018-08-234-10/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use `say`/`error` instead of `puts`/`$stderr.puts`bogdanvlviv2018-08-224-10/+10
* | | | Merge pull request #33666 from cbothner/fail-gracefully-from-activestorage-fi...George Claghorn2018-08-229-18/+118
|\ \ \ \
| * | | | Respond with 404 in ActiveStorage::DiskController#show when file missingCameron Bothner2018-08-213-0/+16
| * | | | Translate service-specific missing object exceptions into a generic oneCameron Bothner2018-08-217-18/+102
* | | | | Include form_with in form_helpers rails guide (#33523)Nick Schwaderer2018-08-221-53/+49
* | | | | Merge pull request #33698 from bogdanvlviv/follow-up-33693Rafael França2018-08-221-1/+0
|\ \ \ \ \
| * | | | | Remove extra execution of `uniq!` on action_methodsbogdanvlviv2018-08-221-1/+0
* | | | | | Merge pull request #33695 from peterzhu2118/masterRafael França2018-08-222-8/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update ParameterFilter to yield original parametersPeter Zhu2018-08-222-8/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #33693 from schneems/schneems/action_methodsRichard Schneeman2018-08-221-1/+4
|\ \ \ \ \
| * | | | | Two fewer array allocations on action_methodsschneems2018-08-221-1/+4
* | | | | | Merge pull request #33697 from bogdanvlviv/rails-command-help-show-descriptionRafael França2018-08-222-2/+5
|\ \ \ \ \ \
| * | | | | | Fix `rails initializers --help` and `rails dev:cache --help`bogdanvlviv2018-08-222-2/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #33685 from krusty3002/masterRafael França2018-08-221-0/+7
|\ \ \ \ \ \
| * | | | | | Fixed file name [ci skip]Claas Zurawski2018-08-221-1/+1
| * | | | | | Added explanation about new_framework_defaults.rb file [ci skip]Claas Zurawski2018-08-221-0/+7
* | | | | | | Merge pull request #33694 from bogdanvlviv/follow-up-33631Rafael França2018-08-221-1/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove `rake initializers` from rake tasks listbogdanvlviv2018-08-221-1/+0
|/ / / / / /
* | | | | | Merge pull request #33162 from utilum/stop_using_mochaKasper Timm Hansen2018-08-2211-59/+200
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove Mocha from Gemfileutilum2018-08-132-6/+0
| * | | | | Add method_call_assertions and use them instead of Mochautilum2018-08-136-36/+170
| * | | | | Stub with Minitest and test with MethodCallAssertionsutilum2018-08-133-17/+30
| | |_|/ / | |/| | |
* | | | | Partly revert unused accessorRyuta Kamizono2018-08-231-8/+1
* | | | | Merge pull request #33691 from tgxworld/add_config_to_disable_advisory_locksMatthew Draper2018-08-238-4/+75
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add database configuration to disable advisory locks.Guo Xiang Tan2018-08-228-4/+75
* | | | | Merge pull request #33547 from Ana06/patch-1Matthew Draper2018-08-233-3/+34
|\ \ \ \ \
| * | | | | Add tests for privates methods in view's helpersAna María Martínez Gómez2018-08-082-1/+14
| * | | | | Deprecate use of private methods in view's helpersAna María Martínez Gómez2018-08-082-4/+14
| * | | | | Add one more method affected in CHANGELOGAna María Martínez Gómez2018-08-081-2/+3
| * | | | | Use public_send in extract_values_from_collectionAna María Martínez Gómez2018-08-081-1/+1
| * | | | | Use public_send in value_for_collectionAna María Martínez Gómez2018-08-072-1/+11
* | | | | | Merge pull request #33659 from palkan/feature/action-cable-testingEileen M. Uchitelle2018-08-228-0/+343
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add Action Cable test case and test helperVladimir Dementyev2018-08-195-0/+255
| * | | | | Add Action Cable test adapterVladimir Dementyev2018-08-193-0/+88
* | | | | | Remove duplicate testutilum2018-08-221-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge pull request #33682 from mroutis/brewfile-add-imagemagickRafael França2018-08-211-0/+1
|\ \ \ \ \
| * | | | | [ci skip] Add ImageMagick to BrewfileMr. Outis2018-08-211-0/+1
|/ / / / /
* | | | | Show the `ENV` value correctly in the doc of `combined_fragment_cache_key` [c...yuuji.yaginuma2018-08-221-1/+1