aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge pull request #31113 from y-yagi/use_e_option_to_specify_environment_in_...Ryuta Kamizono2017-11-102-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use `-e` option to specify the environment in console command [ci skip]yuuji.yaginuma2017-11-102-2/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #31115 from y-yagi/add_missing_requiresRyuta Kamizono2017-11-102-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add missing requiresyuuji.yaginuma2017-11-102-0/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #31116 from y-yagi/remove_unused_requireRyuta Kamizono2017-11-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Remove unused requireyuuji.yaginuma2017-11-101-1/+0
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #31111 from koic/bump_rubocop_to_0_51_0Guillermo Iguaran2017-11-094-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Bump RuboCop to 0.51.0Koichi ITO2017-11-104-4/+4
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #31027 from PHedkvist/inflector_test_typeRafael França2017-11-092-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed typo in test for activesupport parameterizePierre Hedkvist2017-11-012-2/+2
* | | | | | | | | | | | | | | | | Merge pull request #30414 from bogdanvlviv/clear-mysql_database_tasksRafael França2017-11-093-139/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Simplify implementation of `MySQLDatabaseTasks`bogdanvlviv2017-10-303-135/+3
| * | | | | | | | | | | | | | | | | Raise error if unsupported charset for mysqlbogdanvlviv2017-10-302-7/+5
* | | | | | | | | | | | | | | | | | Merge pull request #25346 from bogdan/correct-tags-count-in-fixturesRafael França2017-11-095-11/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Set counter caches to correct values in fixturesBogdan Gusiev2017-11-085-11/+20
* | | | | | | | | | | | | | | | | | | Merge pull request #30985 from lugray/attribute_set_in_amRafael França2017-11-0922-236/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Move Attribute and AttributeSet to ActiveModelLisa Ugray2017-11-0922-236/+225
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #31088 from neumayr/am-helper-missing-field_with_errorsRafael França2017-11-094-3/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix field_error_proc wrap form select optgroup and divider option tagneumayr2017-11-094-3/+104
* | | | | | | | | | | | | | | | | | | | Merge pull request #31099 from nobu/patch-1Rafael Mendonça França2017-11-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Use `Dir.mktmpdir`Nobuyoshi Nakada2017-11-091-1/+1
| * | | | | | | | | | | | | | | | | | | Use `Tempfile.create`Nobuyoshi Nakada2017-11-091-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #31081 from rails/allow-include-time-with-zone-rangeAndrew White2017-11-095-4/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Allow `Range#include?` on TWZ rangesAndrew White2017-11-085-4/+46
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #31102 from y-yagi/do_not_show_credentials_in_generators_helpEileen M. Uchitelle2017-11-092-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Do not show credentials in generators helpyuuji.yaginuma2017-11-092-1/+3
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Should pass `test_no_locks_no_wait` not only on `PostgreSQLAdapter` and `Orac...Ryuta Kamizono2017-11-091-8/+5
* | | | | | | | | | | | | | | | | | Merge pull request #31077 from gsamokovarov/assert-changes-nilRafael França2017-11-092-9/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use plain assert in assert_changes to avoid MT6 refutesGenadi Samokovarov2017-11-072-9/+5
* | | | | | | | | | | | | | | | | | | Merge pull request #31078 from aeroastro/feature/fix-typoRafael França2017-11-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix typo on ActionDispatc::HTTP::FilterParametersTakumasa Ochi2017-11-071-2/+2
* | | | | | | | | | | | | | | | | | | | Merge pull request #31095 from y-yagi/correctly_kill_the_server_in_ujs_testRafael França2017-11-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Correctly kill the server started with ujs testyuuji.yaginuma2017-11-091-2/+2
* | | | | | | | | | | | | | | | | | | | | Merge pull request #31091 from yahonda/concurrent_transaction_test_conditionsRafael França2017-11-081-15/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Run `ConcurrentTransactionTest` if `supports_transaction_isolation?`Yasuo Honda2017-11-081-15/+13
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #31093 from bogdanvlviv/express-console-command-in-the-logRafael França2017-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Change output log about skipping instalation of Active Storagebogdanvlviv2017-11-081-1/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #31092 from bogdanvlviv/remove-redundant-passing-skip-acti...Rafael França2017-11-085-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove redundant passing --skip-active-storage in test casesbogdanvlviv2017-11-085-6/+6
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | `Mysql2Adapter` should pass `ConcurrentTransactionTest`Ryuta Kamizono2017-11-091-1/+1
* | | | | | | | | | | | | | | | | | | | Consolidate redundant `if` and `unless` with the same conditionRyuta Kamizono2017-11-091-3/+1
* | | | | | | | | | | | | | | | | | | | Don't expose accessors which are internal used onlyRyuta Kamizono2017-11-082-3/+6
| |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Don't expose internal methods in `Preloader::ThroughAssociation`Ryuta Kamizono2017-11-081-8/+7
* | | | | | | | | | | | | | | | | | | Merge pull request #31086 from y-yagi/use_released_redis_namespaceMatthew Draper2017-11-082-10/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Use released `redis-namespace` instead of master versionyuuji.yaginuma2017-11-082-10/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #31085 from y-yagi/fix_output_of_select_tag_with_include_b...Ryuta Kamizono2017-11-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix output of `select_tag` with `include_blank: true` [ci skip]yuuji.yaginuma2017-11-081-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #31084 from y-yagi/do_not_run_active_storage_install_when_...Ryuta Kamizono2017-11-089-22/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove unnecessary migration deletionyuuji.yaginuma2017-11-085-19/+0
| * | | | | | | | | | | | | | | | | | Do not run `active_storage:install` when bundle install is skippedyuuji.yaginuma2017-11-084-3/+24
|/ / / / / / / / / / / / / / / / / /