aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix `ActiveModel::Type::DateTime#serialize`Lisa Ugray2017-07-052-0/+17
| |/ / / /
* | | | | Merge pull request #28668 from Dorian/mention-time-parse-argument-errorAaron Patterson2017-07-052-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mention and test for possible ArgumentError when parsing timesDorian Marié2017-04-082-1/+13
* | | | | Merge pull request #29677 from eugeneius/parameters_configuration_testsRafael Mendonça França2017-07-051-0/+36
|\ \ \ \ \
| * | | | | Fix Parameters configuration integration testsEugene Kenny2017-07-041-0/+41
* | | | | | Force ActionController::Base lazy laod hooks to runRafael Mendonça França2017-07-051-0/+12
* | | | | | Merge pull request #29690 from kamipo/fix_warningsRafael França2017-07-051-2/+2
|\ \ \ \ \ \
| * | | | | | Fix warning: `*' interpreted as argument prefixRyuta Kamizono2017-07-061-2/+2
|/ / / / / /
* | | | | | Merge pull request #29687 from k3rni/private-prefixed-delegateMatthew Draper2017-07-062-1/+39
|\ \ \ \ \ \
| * | | | | | Use `map` in `delegate` so that actual prefixed method names are returned, if...Krzysztof Zych2017-07-052-1/+40
|/ / / / / /
* | | | | | Merge pull request #29413 from kamipo/fix_association_with_scope_including_joinsRafael França2017-07-049-70/+60
|\ \ \ \ \ \
| * | | | | | Fix eager loading association with scope including joinsRyuta Kamizono2017-07-044-11/+28
| * | | | | | Fix preloading association with scope including joinsRyuta Kamizono2017-07-046-49/+32
| * | | | | | Remove unused `association_key` and `table` methods in `Preloader::Association`Ryuta Kamizono2017-07-041-10/+0
* | | | | | | Merge pull request #29667 from kamipo/add_missing_attr_name_to_sRafael França2017-07-041-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add missing `attr_name.to_s` in `AttributeMutationTracker`Ryuta Kamizono2017-07-041-2/+3
| |/ / / / /
* | | | | | Fix endRafael Mendonça França2017-07-041-0/+1
* | | | | | Load the Parameters configurations on the right timeRafael Mendonça França2017-07-041-7/+8
* | | | | | Commit gemfile.lockRafael Mendonça França2017-07-041-1/+1
* | | | | | Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_...Rafael França2017-07-043-6/+9
|\ \ \ \ \ \
| * | | | | | Fix `test_copying_migrations_preserving_magic_comments`Ryuta Kamizono2017-07-023-6/+9
* | | | | | | Merge pull request #29675 from jules2689/masterRafael França2017-07-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow the use of Bundler 2.0Julian Nadeau2017-07-041-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #29666 from kamipo/deprecate_database_specific_json_typesRafael França2017-07-043-14/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove database specific JSON typesRyuta Kamizono2017-07-053-14/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #29668 from y-yagi/add_missing_status_code_and_symbolArun Agrawal2017-07-041-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing http status codes [ci skip]yuuji.yaginuma2017-07-041-0/+2
* | | | | | Add backticks [ci skip]Ryuta Kamizono2017-07-032-3/+3
* | | | | | Merge pull request #29638 from amatsuda/require_relative_2017Xavier Noria2017-07-02313-773/+773
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into require_relative_2017Xavier Noria2017-07-02100-495/+796
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #29658 from kamipo/remove_redundant_assert_respond_toKasper Timm Hansen2017-07-023-42/+3
|\ \ \ \ \ \ \
| * | | | | | | Remove redundant `assert_respond_to`Ryuta Kamizono2017-07-033-42/+3
* | | | | | | | Expectation firstAkira Matsuda2017-07-023-9/+9
* | | | | | | | :warning: "Use assert_nil if expecting nil. This will fail in Minitest 6."Akira Matsuda2017-07-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #29566 from eugeneius/wrap_parameters_queryKasper Timm Hansen2017-07-022-7/+10
|\ \ \ \ \ \ \
| * | | | | | | Don't wrap parameters if query parameter existsEugene Kenny2017-06-252-7/+10
* | | | | | | | Merge pull request #29654 from kamipo/fix_deprecation_messageKasper Timm Hansen2017-07-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix removed version 5.2 to 6.0 in the deprecation messageRyuta Kamizono2017-07-021-1/+1
* | | | | | | | | Merge pull request #29656 from y-yagi/move_tmp_clear_testKasper Timm Hansen2017-07-022-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move test related to `tmp:clear` task to `tmp_test.rb`yuuji.yaginuma2017-07-022-7/+7
|/ / / / / / / /
* | | | | | | | Apply record state based on parent transaction stateeileencodes2017-07-014-3/+96
* | | | | | | | Deprecate and replace `set_state` methodeileencodes2017-07-013-6/+73
* | | | | | | | Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-013-0/+58
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-013-0/+58
* | | | | | | | Avoid shadowed variableMatthew Draper2017-07-021-2/+2
* | | | | | | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-022231-2246/+13
* | | | | | | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-022231-13/+2246
|\ \ \ \ \ \ \ \
| * | | | | | | | Enforce frozen string in RubocopKir Shatrov2017-07-012230-13/+2245
* | | | | | | | | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-0265-323/+323
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make ActionView frozen string literal friendly.Pat Allan2017-06-2022-223/+223