Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #29662 from deivid-rodriguez/engine_multiple_mount_points | Rafael França | 2017-07-05 | 5 | -10/+112 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow mounting same engine under several locations | David Rodríguez | 2017-07-05 | 5 | -10/+112 | |
* | | | | | | | Merge pull request #29676 from lugray/fix_date_time_serialize | Rafael França | 2017-07-05 | 2 | -0/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix `ActiveModel::Type::DateTime#serialize` | Lisa Ugray | 2017-07-05 | 2 | -0/+17 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #28668 from Dorian/mention-time-parse-argument-error | Aaron Patterson | 2017-07-05 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Mention and test for possible ArgumentError when parsing times | Dorian Marié | 2017-04-08 | 2 | -1/+13 | |
* | | | | | | | Merge pull request #29677 from eugeneius/parameters_configuration_tests | Rafael Mendonça França | 2017-07-05 | 1 | -0/+36 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix Parameters configuration integration tests | Eugene Kenny | 2017-07-04 | 1 | -0/+41 | |
* | | | | | | | | Force ActionController::Base lazy laod hooks to run | Rafael Mendonça França | 2017-07-05 | 1 | -0/+12 | |
* | | | | | | | | Merge pull request #29690 from kamipo/fix_warnings | Rafael França | 2017-07-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix warning: `*' interpreted as argument prefix | Ryuta Kamizono | 2017-07-06 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #29687 from k3rni/private-prefixed-delegate | Matthew Draper | 2017-07-06 | 2 | -1/+39 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use `map` in `delegate` so that actual prefixed method names are returned, if... | Krzysztof Zych | 2017-07-05 | 2 | -1/+40 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #29413 from kamipo/fix_association_with_scope_including_joins | Rafael França | 2017-07-04 | 9 | -70/+60 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix eager loading association with scope including joins | Ryuta Kamizono | 2017-07-04 | 4 | -11/+28 | |
| * | | | | | | | | Fix preloading association with scope including joins | Ryuta Kamizono | 2017-07-04 | 6 | -49/+32 | |
| * | | | | | | | | Remove unused `association_key` and `table` methods in `Preloader::Association` | Ryuta Kamizono | 2017-07-04 | 1 | -10/+0 | |
* | | | | | | | | | Merge pull request #29667 from kamipo/add_missing_attr_name_to_s | Rafael França | 2017-07-04 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add missing `attr_name.to_s` in `AttributeMutationTracker` | Ryuta Kamizono | 2017-07-04 | 1 | -2/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Fix end | Rafael Mendonça França | 2017-07-04 | 1 | -0/+1 | |
* | | | | | | | | Load the Parameters configurations on the right time | Rafael Mendonça França | 2017-07-04 | 1 | -7/+8 | |
* | | | | | | | | Commit gemfile.lock | Rafael Mendonça França | 2017-07-04 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #29653 from kamipo/fix_test_copying_migrations_preserving_... | Rafael França | 2017-07-04 | 3 | -6/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix `test_copying_migrations_preserving_magic_comments` | Ryuta Kamizono | 2017-07-02 | 3 | -6/+9 | |
* | | | | | | | | | Merge pull request #29675 from jules2689/master | Rafael França | 2017-07-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Allow the use of Bundler 2.0 | Julian Nadeau | 2017-07-04 | 1 | -1/+1 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #29666 from kamipo/deprecate_database_specific_json_types | Rafael França | 2017-07-04 | 3 | -14/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Remove database specific JSON types | Ryuta Kamizono | 2017-07-05 | 3 | -14/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #29668 from y-yagi/add_missing_status_code_and_symbol | Arun Agrawal | 2017-07-04 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Add missing http status codes [ci skip] | yuuji.yaginuma | 2017-07-04 | 1 | -0/+2 | |
* | | | | | | | | Add backticks [ci skip] | Ryuta Kamizono | 2017-07-03 | 2 | -3/+3 | |
* | | | | | | | | Merge pull request #29638 from amatsuda/require_relative_2017 | Xavier Noria | 2017-07-02 | 313 | -773/+773 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into require_relative_2017 | Xavier Noria | 2017-07-02 | 100 | -495/+796 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #29658 from kamipo/remove_redundant_assert_respond_to | Kasper Timm Hansen | 2017-07-02 | 3 | -42/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove redundant `assert_respond_to` | Ryuta Kamizono | 2017-07-03 | 3 | -42/+3 | |
* | | | | | | | | | | Expectation first | Akira Matsuda | 2017-07-02 | 3 | -9/+9 | |
* | | | | | | | | | | :warning: "Use assert_nil if expecting nil. This will fail in Minitest 6." | Akira Matsuda | 2017-07-02 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #29566 from eugeneius/wrap_parameters_query | Kasper Timm Hansen | 2017-07-02 | 2 | -7/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Don't wrap parameters if query parameter exists | Eugene Kenny | 2017-06-25 | 2 | -7/+10 | |
* | | | | | | | | | | Merge pull request #29654 from kamipo/fix_deprecation_message | Kasper Timm Hansen | 2017-07-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix removed version 5.2 to 6.0 in the deprecation message | Ryuta Kamizono | 2017-07-02 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #29656 from y-yagi/move_tmp_clear_test | Kasper Timm Hansen | 2017-07-02 | 2 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Move test related to `tmp:clear` task to `tmp_test.rb` | yuuji.yaginuma | 2017-07-02 | 2 | -7/+7 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Apply record state based on parent transaction state | eileencodes | 2017-07-01 | 4 | -3/+96 | |
* | | | | | | | | | | Deprecate and replace `set_state` method | eileencodes | 2017-07-01 | 3 | -6/+73 | |
* | | | | | | | | | | Merge pull request #29622 from yalab/warning_system_tesing_http_verb | Eileen M. Uchitelle | 2017-07-01 | 3 | -0/+58 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | SystemTestCase undef some IntegrationTest methods because it's confused to use. | yalab | 2017-07-01 | 3 | -0/+58 | |
* | | | | | | | | | | Avoid shadowed variable | Matthew Draper | 2017-07-02 | 1 | -2/+2 | |
* | | | | | | | | | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" | Matthew Draper | 2017-07-02 | 2231 | -2246/+13 | |
* | | | | | | | | | | Merge pull request #29540 from kirs/rubocop-frozen-string | Matthew Draper | 2017-07-02 | 2231 | -13/+2246 | |
|\ \ \ \ \ \ \ \ \ \ |