aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adds download link helper explanationJeffrey Guenther2017-11-201-2/+9
* ProofreadingJeffrey Guenther2017-11-181-2/+2
* Integrates George's suggestionsJeffrey Guenther2017-11-181-52/+135
* Adds testing sectionJeffrey Guenther2017-11-161-2/+42
* Adds more explanation to points and add setup sectionJeffrey Guenther2017-11-161-6/+69
* Merge branch 'master' into activestorage-guideJeffrey Guenther2017-11-09115-510/+1554
|\
| * 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
| |/ / / /
| * | | / 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