aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29705 from y-yagi/do_not_update_secrets_yml_encMatthew Draper2017-07-092-1/+21
|\
| * Do not update `secrets.yml.enc` when secretes do not changeyuuji.yaginuma2017-07-072-1/+21
* | Merge pull request #29706 from kamipo/use_information_schema_to_extract_expre...Matthew Draper2017-07-092-2/+2
|\ \
| * | Use `information_schema` to extract `generation_expression` for MariaDBRyuta Kamizono2017-07-072-2/+2
* | | Merge pull request #29708 from kamipo/fix_current_timestamp_for_mariadbMatthew Draper2017-07-091-2/+2
|\ \ \
| * | | Fix default `CURRENT_TIMESTAMP` in schema dumping for MariaDB 10.2Ryuta Kamizono2017-07-071-2/+2
| |/ /
* | | Merge pull request #29718 from ragesoss/masterRichard Schneeman2017-07-081-2/+20
|\ \ \
| * | | Clarify i18n guide for how pluralization rules work by defaultSage Ross2017-07-071-2/+20
* | | | Don't call register on custom driverseileencodes2017-07-082-5/+5
* | | | Merge pull request #29680 from koic/update_default_app_files_in_app_generator...Eileen M. Uchitelle2017-07-081-2/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Update default app files in app_generator_testKoichi ITO2017-07-061-2/+40
| | |/ | |/|
* | | Merge pull request #29714 from jahfer/implement-errors-mergeRafael França2017-07-073-0/+28
|\ \ \
| * | | Add ActiveModel::Errors#merge!Jahfer Husain2017-07-073-0/+28
| | |/ | |/|
* / | Test thor masterRafael Mendonça França2017-07-072-1/+8
|/ /
* | Merge pull request #29704 from kamipo/fix_mariadb_versionJeremy Daer2017-07-061-2/+6
|\ \ | |/ |/|
| * Fix extracting MariaDB versionRyuta Kamizono2017-07-071-2/+6
|/
* Merge pull request #29662 from deivid-rodriguez/engine_multiple_mount_pointsRafael França2017-07-055-10/+112
|\
| * Allow mounting same engine under several locationsDavid Rodríguez2017-07-055-10/+112
* | Merge pull request #29676 from lugray/fix_date_time_serializeRafael França2017-07-052-0/+17
|\ \
| * | 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
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 11:49:11 +0000