aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* convert order arg to string before checking if we can reverse itBen Toews2017-11-092-2/+6
* use << instead of #concat in #reverse_sql_order because we might be working w...Ben Toews2017-11-092-2/+2
* try using regexesBen Toews2017-11-0927-166/+120
* allow table name and direction in string order argBen Toews2017-11-0927-244/+295
* work around deprecation warnings in a bunch of testsBen Toews2017-11-0934-313/+320
* always allow Arel::Attributes::Attribute alsoBen Toews2017-11-091-1/+3
* call enforce_raw_sql_whitelist on @klass so it works with FakeKlassBen Toews2017-11-091-2/+2
* work with actual string when reversing orderBen Toews2017-11-091-0/+3
* remove :enabled optionBen Toews2017-11-093-59/+52
* beef up deprecation warningBen Toews2017-11-091-3/+7
* make tests more verbose/explicitBen Toews2017-11-091-78/+96
* allow Arel.sql() for pluckBen Toews2017-11-098-101/+159
* add config to check arguments to unsafe AR methodsBen Toews2017-11-096-21/+293
* 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
|/ / /
* | | Remove needless block parameterGeorge Claghorn2017-11-071-1/+1
* | | Merge pull request #31076 from y-yagi/fix_comment_in_check_class_collisionRyuta Kamizono2017-11-071-1/+1
|\ \ \
| * | | Fix comment in `check_class_collision` [ci skip]yuuji.yaginuma2017-11-071-1/+1
* | | | Merge pull request #30997 from q-centrix/nofollow-changeRafael França2017-11-061-3/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'upstream/master' into nofollow-changeDillon Welch2017-11-0367-174/+204
| |\ \ \
| * | | | Fix typoDillon Welch2017-11-021-1/+1
| * | | | Remove test fileDillon Welch2017-11-021-110/+0
| * | | | Use blank? check instead of key? checkDillon Welch2017-11-022-3/+113
| * | | | Prevent extra string allocations when no 'rel' arg passedDillon Welch2017-10-261-3/+7
* | | | | Merge pull request #31061 from bogdanvlviv/test-if-unless-options-for-validat...Rafael França2017-11-065-7/+62
|\ \ \ \ \
| * | | | | Add cases to test combining validation conditionsbogdanvlviv2017-11-065-7/+62
* | | | | | Merge pull request #30714 from bogdanvlviv/fix-rails_db_migrate_VERSIONRafael França2017-11-067-14/+355
|\ \ \ \ \ \
| * | | | | | Fix `bin/rails db:migrate` with specified `VERSION`bogdanvlviv2017-11-067-14/+355