aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #30201 from kamipo/eval_active_storage_attached_name_only_...Rafael França2017-08-111-12/+8
|\
| * Evaluate `@active_storage_attached_#{name}` only onceRyuta Kamizono2017-08-121-12/+8
* | Merge pull request #30202 from kamipo/add_null_false_to_active_storage_tablesRafael França2017-08-111-10/+10
|\ \
| * | Add `null: false` to Active Storage tablesRyuta Kamizono2017-08-121-10/+10
| |/
* | Specify `table.name` only when `scope.table` and `table` are different (#29058)Ryuta Kamizono2017-08-112-4/+13
* | Remove unused `close_connection` in Action Cable tests (#30195)Ryuta Kamizono2017-08-112-8/+0
* | Enable browser caching for blobs and variants (#30196)Anton Khamets2017-08-113-0/+17
|/
* Microsoft Azure --> Microsoft Azure Storage [ci skip]Ryuta Kamizono2017-08-121-1/+1
* Refactor app_generator_test (#30192)yhirano552017-08-111-1/+8
* Merge pull request #30186 from yhirano55/fix_generator_example_codeRobin Dupret2017-08-111-2/+2
|\
| * Fix example codes for generators guide [ci skip]Yoshiyuki Hirano2017-08-111-2/+2
* | Merge pull request #30197 from ohbarye/fix-rdoc-code-formattingRyuta Kamizono2017-08-113-7/+7
|\ \
| * | Fix RDoc formatting: `+` doesn't work with `@`ohbarye2017-08-113-7/+7
|/ /
* | Merge pull request #30190 from ydakuka/patch-1Vipul A M2017-08-111-2/+2
|\ \
| * | Update testing.mdYauheni Dakuka2017-08-111-2/+2
|/ /
* | Merge pull request #30189 from koic/fix_formatting_of_active_storage_docsRyuta Kamizono2017-08-117-33/+33
|\ \
| * | Fix formatting of Active Storage docs [ci skip]Koichi ITO2017-08-117-33/+33
|/ /
* | Merge pull request #30188 from y-yagi/fix_formatting_of_active_storage_docsRyuta Kamizono2017-08-119-36/+36
|\ \
| * | Fix formatting of Active Storage docs [ci skip]yuuji.yaginuma2017-08-119-36/+36
|/ /
* | Run Active Storage tests in CI (#30144)George Claghorn2017-08-106-21/+21
* | Merge pull request #30183 from kamipo/reaper_run_after_conn_pool_initializedMatthew Draper2017-08-111-2/+3
|\ \
| * | Start `@reaper.run` after connection pool initializedRyuta Kamizono2017-08-111-2/+3
* | | Isolate ActiveStorage namespaces (#30095)Dino Maric2017-08-102-1/+3
* | | Merge pull request #30164 from bogdanvlviv/improve-railties-generators-testsRafael França2017-08-104-45/+85
|\ \ \
| * | | `--skip-action-cable` pass throughs `rails plugin new`bogdanvlviv2017-08-103-1/+11
| * | | Improve plugin generator tests. Related to #30123.bogdanvlviv2017-08-102-44/+74
| |/ /
* | | Merge pull request #30152 from bogdanvlviv/fix_random_ci_failureMatthew Draper2017-08-101-1/+1
|\ \ \
| * | | Fix random CI failure due to non-deterministic sorting orderbogdanvlviv2017-08-091-1/+1
| |/ /
* | | Merge pull request #30174 from qsona/storageRyuta Kamizono2017-08-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix a typoqsona2017-08-101-1/+1
|/ /
* | Revert "Revert "Set Ruby version in Gemfile and .ruby-version by default""David Heinemeier Hansson2017-08-094-0/+24
* | Revert "Set Ruby version in Gemfile and .ruby-version by default"schneems2017-08-094-24/+0
* | Merge pull request #30170 from bogdanvlviv/fix_random_ci_failure_ar_dirtyRafael França2017-08-091-4/+3
|\ \
| * | Fix random CI failure DirtyTest:bogdanvlviv2017-08-091-4/+3
| |/
* | Merge pull request #30161 from tjschuck/rdoc_code_format_fixRobin Dupret2017-08-091-1/+1
|\ \ | |/ |/|
| * Fix broken RDoc formattingT.J. Schuck2017-08-091-1/+1
|/
* Merge pull request #30091 from yhirano55/fix_engine_commandRafael França2017-08-082-0/+6
|\
| * Fix engine commandYoshiyuki Hirano2017-08-062-0/+6
* | Merge pull request #30088 from y-yagi/use_the_same_key_as_presented_in_docRafael França2017-08-081-1/+1
|\ \
| * | Use the same key as presented in docyuuji.yaginuma2017-08-091-1/+1
* | | Merge pull request #30090 from yhirano55/fix_escaped_characterRafael França2017-08-081-1/+1
|\ \ \
| * | | Fix escaped characterYoshiyuki Hirano2017-08-061-1/+1
| | |/ | |/|
* | | Merge pull request #30108 from yui-knk/require_concurrent_mapRafael França2017-08-081-0/+2
|\ \ \
| * | | Add missed `require`yui-knk2017-08-071-0/+2
* | | | Merge pull request #30112 from dixpac/filter_minitest_backtraceRafael França2017-08-081-0/+4
|\ \ \ \
| * | | | Filter out Minitest backtrace.dixpac2017-08-071-0/+4
| |/ / /
* | | | Merge pull request #30109 from koic/simplify_git_source_in_gemfileRafael França2017-08-081-4/+1
|\ \ \ \
| * | | | Simplify `git_source` in GemfileKoichi ITO2017-08-071-4/+1
| |/ / /
* | | | Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-aliasRafael França2017-08-083-3/+36
|\ \ \ \
| * | | | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-073-3/+36
| |/ / /