Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge pull request #30197 from ohbarye/fix-rdoc-code-formatting | Ryuta Kamizono | 2017-08-11 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix RDoc formatting: `+` doesn't work with `@` | ohbarye | 2017-08-11 | 3 | -7/+7 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #30190 from ydakuka/patch-1 | Vipul A M | 2017-08-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Update testing.md | Yauheni Dakuka | 2017-08-11 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #30189 from koic/fix_formatting_of_active_storage_docs | Ryuta Kamizono | 2017-08-11 | 7 | -33/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix formatting of Active Storage docs [ci skip] | Koichi ITO | 2017-08-11 | 7 | -33/+33 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #30188 from y-yagi/fix_formatting_of_active_storage_docs | Ryuta Kamizono | 2017-08-11 | 9 | -36/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix formatting of Active Storage docs [ci skip] | yuuji.yaginuma | 2017-08-11 | 9 | -36/+36 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Run Active Storage tests in CI (#30144) | George Claghorn | 2017-08-10 | 6 | -21/+21 | |
* | | | | | | | | | | | Merge pull request #30183 from kamipo/reaper_run_after_conn_pool_initialized | Matthew Draper | 2017-08-11 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Start `@reaper.run` after connection pool initialized | Ryuta Kamizono | 2017-08-11 | 1 | -2/+3 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Isolate ActiveStorage namespaces (#30095) | Dino Maric | 2017-08-10 | 2 | -1/+3 | |
* | | | | | | | | | | | Merge pull request #30164 from bogdanvlviv/improve-railties-generators-tests | Rafael França | 2017-08-10 | 4 | -45/+85 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | `--skip-action-cable` pass throughs `rails plugin new` | bogdanvlviv | 2017-08-10 | 3 | -1/+11 | |
| * | | | | | | | | | | | Improve plugin generator tests. Related to #30123. | bogdanvlviv | 2017-08-10 | 2 | -44/+74 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #30152 from bogdanvlviv/fix_random_ci_failure | Matthew Draper | 2017-08-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix random CI failure due to non-deterministic sorting order | bogdanvlviv | 2017-08-09 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #30174 from qsona/storage | Ryuta Kamizono | 2017-08-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix a typo | qsona | 2017-08-10 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Revert "Revert "Set Ruby version in Gemfile and .ruby-version by default"" | David Heinemeier Hansson | 2017-08-09 | 4 | -0/+24 | |
* | | | | | | | | | | Revert "Set Ruby version in Gemfile and .ruby-version by default" | schneems | 2017-08-09 | 4 | -24/+0 | |
* | | | | | | | | | | Merge pull request #30170 from bogdanvlviv/fix_random_ci_failure_ar_dirty | Rafael França | 2017-08-09 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix random CI failure DirtyTest: | bogdanvlviv | 2017-08-09 | 1 | -4/+3 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #30161 from tjschuck/rdoc_code_format_fix | Robin Dupret | 2017-08-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix broken RDoc formatting | T.J. Schuck | 2017-08-09 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #30091 from yhirano55/fix_engine_command | Rafael França | 2017-08-08 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix engine command | Yoshiyuki Hirano | 2017-08-06 | 2 | -0/+6 | |
* | | | | | | | | | Merge pull request #30088 from y-yagi/use_the_same_key_as_presented_in_doc | Rafael França | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use the same key as presented in doc | yuuji.yaginuma | 2017-08-09 | 1 | -1/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #30090 from yhirano55/fix_escaped_character | Rafael França | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix escaped character | Yoshiyuki Hirano | 2017-08-06 | 1 | -1/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #30108 from yui-knk/require_concurrent_map | Rafael França | 2017-08-08 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add missed `require` | yui-knk | 2017-08-07 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #30112 from dixpac/filter_minitest_backtrace | Rafael França | 2017-08-08 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Filter out Minitest backtrace. | dixpac | 2017-08-07 | 1 | -0/+4 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #30109 from koic/simplify_git_source_in_gemfile | Rafael França | 2017-08-08 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Simplify `git_source` in Gemfile | Koichi ITO | 2017-08-07 | 1 | -4/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-alias | Rafael França | 2017-08-08 | 3 | -3/+36 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Deprecate ActionDispatch::TestResponse response aliases | Trevor Wistaff | 2017-08-07 | 3 | -3/+36 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #29767 from yui-knk/ac_test | Rafael França | 2017-08-08 | 1 | -7/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove needless restoring of `default_charset` | yui-knk | 2017-07-13 | 1 | -7/+2 | |
* | | | | | | | | | | Merge pull request #30115 from intrip/30049-application-controller-renderer-d... | Rafael França | 2017-08-08 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix ApplicationController.renderer.defaults overriding in development | Jacopo | 2017-07-20 | 1 | -4/+6 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #30142 from yukideluxe/add-missing-bit-reload-associations... | Sean Griffin | 2017-08-08 | 2 | -6/+36 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add missing collection.reload documentation [ci skip] | Julia López | 2017-08-08 | 2 | -6/+36 | |
* | | | | | | | | | | Merge pull request #30133 from kamipo/fix_random_ci_failure | Rafael França | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix random CI failure due to non-deterministic sorting order | Ryuta Kamizono | 2017-08-08 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #30123 from yhirano55/fix_dummy_app_configuration | Rafael França | 2017-08-08 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix dummy_app configuration | Yoshiyuki Hirano | 2017-08-08 | 1 | -3/+5 | |
* | | | | | | | | | | | | Merge pull request #30122 from yhirano55/use_with_dummy_app_in_gitignore | Rafael França | 2017-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |