aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 generator example code [ci skip]
| * 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 `@` [ci skip]
| * | Fix RDoc formatting: `+` doesn't work with `@`ohbarye2017-08-113-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | refs: https://github.com/rails/rails/pull/30161 ``` $ echo "+@size+" | rdoc --pipe <p>+@size+</p> $ echo "<tt>@size</tt>" | rdoc --pipe <p><code>@size</code></p> ``` [ci skip]
* | Merge pull request #30190 from ydakuka/patch-1Vipul A M2017-08-111-2/+2
|\ \ | | | | | | [ci skip] Update testing.md [ci skip]
| * | 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]
| * | Fix formatting of Active Storage docs [ci skip]Koichi ITO2017-08-117-33/+33
|/ / | | | | | | Follow up of #30188.
* | 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]
| * | Fix formatting of Active Storage docs [ci skip]yuuji.yaginuma2017-08-119-36/+36
|/ / | | | | | | | | * Use `+` instead of backquote. * Remove escape from class to be link
* | 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 initialized
| * | Start `@reaper.run` after connection pool initializedRyuta Kamizono2017-08-111-2/+3
| | | | | | | | | | | | | | | | | | | | | Otherwise `ConnectionPool#reap` may run before `@connections` has initialized. https://travis-ci.org/rails/rails/jobs/263037427#L888-L890
* | | Isolate ActiveStorage namespaces (#30095)Dino Maric2017-08-102-1/+3
| | | | | | | | | | | | | | | | | | | | | * Isolate ActiveStorage namespaces * Rename migrations task [Rafael Mendonça França + Dino Maric]
* | | Merge pull request #30164 from bogdanvlviv/improve-railties-generators-testsRafael França2017-08-104-45/+85
|\ \ \ | | | | | | | | Improve railties generators tests
| * | | `--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
| |/ / | | | | | | | | | | | | | | | | | | | | | Improve app generator tests. Ensure that generation `config/application.rb` is correct. Ensure that generation `config/application.rb` is correct.
* | | Merge pull request #30152 from bogdanvlviv/fix_random_ci_failureMatthew Draper2017-08-101-1/+1
|\ \ \ | | | | | | | | Fix random CI failure due to non-deterministic sorting order
| * | | Fix random CI failure due to non-deterministic sorting orderbogdanvlviv2017-08-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` rails/activerecord$ bundle exec rake postgresql:test --verbose TESTOPTS="--seed=36062" Failure: AssociationsJoinModelTest#test_has_many_through_polymorphic_has_one [/home/travis/build/rails/rails/activerecord/test/cases/associations/join_model_test.rb:407]: --- expected +++ actual @@ -1 +1 @@ -[ #<Tagging id: 1, tag_id: 1, super_tag_id: 2, taggable_type: "Post", taggable_id: 1, comment: nil>, #<Tagging id: 2, tag_id: 1, super_tag_id: nil, taggable_type: "Post", taggable_id: 2, comment: nil> ] +#<ActiveRecord::Associations::CollectionProxy [ #<Tagging id: 2, tag_id: 1, super_tag_id: nil, taggable_type: "Post", taggable_id: 2, comment: nil>, #<Tagging id: 1, tag_id: 1, super_tag_id: 2, taggable_type: "Post", taggable_id: 1, comment: nil> ]> ```
* | | Merge pull request #30174 from qsona/storageRyuta Kamizono2017-08-101-1/+1
|\ \ \ | |_|/ |/| | Fix a typo in code comment [ci skip]
| * | 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
| | | | | | | | | | | | This reverts commit a8f59044fb18ce718367ffe4cd3ec0259c766b5f. See discussion on https://github.com/rails/rails/pull/30016.
* | Revert "Set Ruby version in Gemfile and .ruby-version by default"schneems2017-08-094-24/+0
| | | | | | | | This reverts commit fd7f978a5068921380308fe439af3923566c8f61.
* | Merge pull request #30170 from bogdanvlviv/fix_random_ci_failure_ar_dirtyRafael França2017-08-091-4/+3
|\ \ | | | | | | Fix random CI failure DirtyTest
| * | Fix random CI failure DirtyTest:bogdanvlviv2017-08-091-4/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | ``` rails/activerecord$ bundle exec rake postgresql:test TESTOPTS="--seed=26536" ..(compressed)....F Failure: DirtyTest#test_save_should_not_save_serialized_attribute_with_partial_writes_if_not_present [/home/travis/build/rails/rails/activerecord/test/cases/dirty_test.rb:473]: Expected nil to not be nil. ```
* | Merge pull request #30161 from tjschuck/rdoc_code_format_fixRobin Dupret2017-08-091-1/+1
|\ \ | |/ |/| Fix broken RDoc formatting
| * Fix broken RDoc formattingT.J. Schuck2017-08-091-1/+1
|/ | | | | The `@` ivar format doesn’t work with RDoc's `+` code formatting; needs `<tt>`. [ci skip]
* Merge pull request #30091 from yhirano55/fix_engine_commandRafael França2017-08-082-0/+6
|\ | | | | Fix engine command
| * 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 doc
| * | Use the same key as presented in docyuuji.yaginuma2017-08-091-1/+1
| | | | | | | | | | | | Ref: https://github.com/rails/rails/blob/a8217bb594a625fb46a6af1488c0bde4aeac4986/railties/lib/rails/generators/rails/app/templates/config/storage.yml#L24
* | | Merge pull request #30090 from yhirano55/fix_escaped_characterRafael França2017-08-081-1/+1
|\ \ \ | | | | | | | | Fix non escaped character
| * | | 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`
| * | | Add missed `require`yui-knk2017-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | `ActiveRecord::ConnectionAdapters::QueryCache::ConnectionPoolConfiguration` depends on `Concurrent::Map`.
* | | | Merge pull request #30112 from dixpac/filter_minitest_backtraceRafael França2017-08-081-0/+4
|\ \ \ \ | | | | | | | | | | ActiveStorage:Filter out Minitest backtrace.
| * | | | Filter out Minitest backtrace.dixpac2017-08-071-0/+4
| |/ / / | | | | | | | | | | | | | | | | Filter out Minitest backtrace while allowing backtrace from other libraries to be shown.
* | | | Merge pull request #30109 from koic/simplify_git_source_in_gemfileRafael França2017-08-081-4/+1
|\ \ \ \ | | | | | | | | | | Simplify `git_source` in Gemfile
| * | | | Simplify `git_source` in GemfileKoichi ITO2017-08-071-4/+1
| |/ / / | | | | | | | | | | | | Follow up of https://github.com/rails/rails/commit/0b8441bd415c444b8d4afbfc93af79ec7677aa2c
* | | | Merge pull request #30104 from trev/deprecate-actiondispatch-testresponse-aliasRafael França2017-08-083-3/+36
|\ \ \ \ | | | | | | | | | | Deprecate ActionDispatch::TestResponse response aliases
| * | | | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-073-3/+36
| |/ / / | | | | | | | | | | | | https://github.com/rails/rails/issues/30072
* | | | Merge pull request #29767 from yui-knk/ac_testRafael França2017-08-081-7/+2
|\ \ \ \ | | | | | | | | | | Remove needless restoring of `default_charset`
| * | | | Remove needless restoring of `default_charset`yui-knk2017-07-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `default_charset` is not changed in this test case, so we do not need to backup an original value and restore it.
* | | | | Merge pull request #30115 from ↵Rafael França2017-08-081-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | intrip/30049-application-controller-renderer-defaults-automatic-reload-in-dev Fix ApplicationController.renderer.defaults overriding in development
| * | | | Fix ApplicationController.renderer.defaults overriding in developmentJacopo2017-07-201-4/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Previously overriding ApplicationController.renderer.defaults wasn't working effectively in development. In fact the override was unset every time the code was reloaded. The solution is to wrap the code in a `.to_prepare` block.
* | | | Merge pull request #30142 from ↵Sean Griffin2017-08-082-6/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yukideluxe/add-missing-bit-reload-associations-docs add missing collection.reload documentation [ci skip]
| * | | | add missing collection.reload documentation [ci skip]Julia López2017-08-082-6/+36
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 21:58:26 +0000