aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add stopgap_13632 workaroundMatthew Draper2017-08-292-0/+6
| | | | | I'm not sure this is the problem we're seeing on Travis (occasional unexpected IOError exceptions), but it's worth a try.
* Merge pull request #30447 from yhirano55/update_caching_with_railsEileen M. Uchitelle2017-08-291-3/+3
|\ | | | | Update Caching with Rails guide [ci skip]
| * Update Caching with Rails guide [ci skip]Yoshiyuki Hirano2017-08-291-3/+3
| |
* | Merge pull request #30451 from ↵Ryuta Kamizono2017-08-292-1/+7
|\ \ | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_dbconsole_with_sqlserver Fix `can't modify frozen String` error in `DBConsole`
| * | Fix `can't modify frozen String` error in `DBConsole`yuuji.yaginuma2017-08-292-1/+7
|/ / | | | | | | | | | | | | | | | | Without this, `dbconsole` raises an error as follwing: ``` RuntimeError: can't modify frozen String railties/lib/rails/commands/dbconsole/dbconsole_command.rb:79:in `start' ```
* | Merge pull request #30439 from prathamesh-sonpatki/changelog-30360Ryuta Kamizono2017-08-291-0/+5
|\ \ | | | | | | Added CHANGELOG for #30360 [ci skip]
| * | Added CHANGELOG for #30360 [ci skip]Prathamesh Sonpatki2017-08-281-0/+5
| | |
* | | Merge pull request #30446 from yhirano55/update_rails_i18n_guideRyuta Kamizono2017-08-291-10/+10
|\ \ \ | | | | | | | | Update Rails I18n API guide [ci skip]
| * | | Update Rails I18n API guide [ci skip]Yoshiyuki Hirano2017-08-291-10/+10
| | |/ | |/|
* | | Merge pull request #30433 from ↵Ryuta Kamizono2017-08-292-7/+45
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_debug_locks Fix `can't modify frozen String` error in `DebugLocks`
| * | | Fix `warning: shadowing outer local variable`yuuji.yaginuma2017-08-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes following warnings: ``` actionpack/lib/action_dispatch/middleware/debug_locks.rb:46: warning: shadowing outer local variable - threads ```
| * | | Fix `can't modify frozen String` error in `DebugLocks`yuuji.yaginuma2017-08-282-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `DebugLocks` middleware raises an error as follwing: ``` Puma caught this error: can't modify frozen String (RuntimeError) actionpack/lib/action_dispatch/middleware/debug_locks.rb:97:in `block in render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `each' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `map' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:37:in `call' railties/lib/rails/engine.rb:524:in `call' ```
* | | | Synchronously destroy attachmentsGeorge Claghorn2017-08-292-9/+7
| | | |
* | | | Merge pull request #30445 from prathamesh-sonpatki/fix-30441Kasper Timm Hansen2017-08-281-0/+2
|\ \ \ \ | | | | | | | | | | Clarify that bulk option is supported only by MySQL
| * | | | Clarify that bulk option is supported only by MySQL [ci skip]Prathamesh Sonpatki2017-08-291-0/+2
| | |_|/ | |/| | | | | | | | | | - Closes #30441
* | | | Merge pull request #30370 from ↵Kasper Timm Hansen2017-08-283-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | yhirano55/fix_indentation_in_secrets_yaml_template Fix indentation in the template for secrets
| * | | Fix indentation in the template for secretsYoshiyuki Hirano2017-08-233-5/+5
| | | |
* | | | "models/reader" is no longer used in `autosave_association_test.rb`Ryuta Kamizono2017-08-281-1/+0
| | | |
* | | | Address `test_assign_ids_for_through_a_belongs_to` failureRyuta Kamizono2017-08-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `:readers` fixture is loaded before the test, it will be failed. Use `firm.developer_ids` instead because we don't have `:contracts` fixture for now. https://travis-ci.org/rails/rails/jobs/268976230#L729
* | | | `@previous_reflection.options[:source_type]` in `PolymorphicReflection` is ↵Ryuta Kamizono2017-08-281-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | always true Because `add_as_polymorphic_through` is only called when `options[:source_type]` is true.
* | | | Merge pull request #30421 from y-yagi/fix_30405Eileen M. Uchitelle2017-08-273-13/+39
|\ \ \ \ | | | | | | | | | | Retrive screenshot in relative path of current directory
| * | | | Retrive screenshot in relative path of current directoryyuuji.yaginuma2017-08-273-13/+39
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails engine `Rails.root `returns the path of the dummy application. Therefore, there is no `tmp` directly where the test is running, so can not get the screenshot. For this reason, instead of directly specifying tmp, retrive screenshot by relative path from the current directory. Fixes #30405
* | | | Merge pull request #30435 from yhirano55/fix_grammer_in_guide_for_javascriptVipul A M2017-08-271-6/+6
|\ \ \ \ | | | | | | | | | | Fix grammar in JavaScript in Rails [ci skip]
| * | | | Fix grammar in guide [ci skip]Yoshiyuki Hirano2017-08-281-6/+6
| | | | | | | | | | | | | | | | | | | | * I've fixed grammar problems in the guide about JavaScript in Rails.
* | | | | Remove unused `RuntimeReflection#alias_candidate`Ryuta Kamizono2017-08-281-4/+0
| | | | | | | | | | | | | | | | | | | | `RuntimeReflection#alias_candidate` is no longer used since 0408e212.
* | | | | Remove trailing spaces [ci skip]Ryuta Kamizono2017-08-276-10/+10
|/ / / /
* | | | Should be appear deprecation message for every call (#29649)Ryuta Kamizono2017-08-272-8/+1
| | | | | | | | | | | | Context: https://github.com/rails/rails/pull/29619#discussion_r125158589
* | | | Omit the default limit for float columns (#28041)Ryuta Kamizono2017-08-273-5/+10
| | | |
* | | | Prefer to place a table options before `force: :cascade` (#28005)Ryuta Kamizono2017-08-275-11/+10
| |_|/ |/| | | | | | | | | | | | | | I was added a table options after `force: :cascade` in #17569 for not touching existing tests (reducing diff). But `force: :cascade` is not an important information. So I prefer to place a table options before `force: :cascade`.
* | | Merge pull request #30432 from yhirano55/use_tt_in_doc_for_actionviewRyuta Kamizono2017-08-275-24/+24
|\ \ \ | | | | | | | | Use tt in doc for ActionView [ci skip]
| * | | Use tt in doc for ActionView [ci skip]Yoshiyuki Hirano2017-08-275-24/+24
| | | |
* | | | Merge pull request #30429 from yhirano55/use_tt_in_doc_for_activerecordRyuta Kamizono2017-08-277-22/+22
|\ \ \ \ | | | | | | | | | | Use tt in doc for ActiveRecord [ci skip]
| * | | | Use tt in doc for ActiveRecord [ci skip]Yoshiyuki Hirano2017-08-277-22/+22
| |/ / /
* | | | Merge pull request #30430 from yhirano55/use_tt_in_doc_for_railtiesRyuta Kamizono2017-08-274-7/+7
|\ \ \ \ | |/ / / |/| | | Use tt in doc for ActiveSupport and Railties [skip ci]
| * | | Use tt in doc for railties [skip ci]Yoshiyuki Hirano2017-08-274-7/+7
|/ / /
* | | Merge pull request #30427 from yhirano55/fix_broken_doc_layout_for_action_viewRyuta Kamizono2017-08-2722-22/+22
|\ \ \ | | | | | | | | Fix broken doc layout for action_view [ci skip]
| * | | Fix broken doc layout for action_view [ci skip]Yoshiyuki Hirano2017-08-2722-22/+22
| | | |
* | | | Merge pull request #30426 from robin850/remove-top-level-ast-constantsGeorge Claghorn2017-08-261-1/+8
|\ \ \ \ | |/ / / |/| | | Remove Active Storage duplicated classes from the API site
| * | | Remove Active Storage duplicated classes from the API siteRobin Dupret2017-08-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since cb5af0d7, some classes that are under Active Storage are now part of the API site. However, these classes aren't nested under a definition of the `ActiveStorage` module but rather name-spaced under it like `ActiveStorage::Foo`. Thus, these classes are present both under the ActiveStorage label and at the root of the site's sidebar so we have to strip out duplicates. [ci skip]
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-08-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Fix a typoyui-knk2017-08-181-1/+1
| | | | | | | | | | | | | | | | We always plural form for `resources` method.
* | | | Merge pull request #30424 from ↵George Claghorn2017-08-262-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | koic/fix_order_of_active_storage_disk_url_parameters Fix order of Active Storage DiskService URL parameters
| * | | | Fix order of Active Storage DiskService URL parametersKoichi ITO2017-08-262-2/+2
|/ / / / | | | | | | | | | | | | `content_type` parameter is before `disposition` parameter.
* | | | Merge pull request #30422 from dansteele/patch-3Vipul A M2017-08-261-1/+4
|\ \ \ \ | |_|/ / |/| | | Correct wording and adding info [ci skip]
| * | | Correct wording and adding info [ci skip]Daniel Steele2017-08-261-1/+4
|/ / / | | | | | | I had to do some I was unsure what kind of caching it was performing, and had to do some Googling. Also improves the wording.
* | | Fix random CI failure due to non-deterministic sorting orderRyuta Kamizono2017-08-261-6/+6
| | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/268599781#L784
* | | Merge pull request #30418 from yhirano55/use_tt_in_doc_for_actionpackRyuta Kamizono2017-08-268-17/+17
|\ \ \ | | | | | | | | Use tt in doc for action_pack [ci skip]
| * | | Use tt in doc for ActionPack [ci skip]Yoshiyuki Hirano2017-08-268-17/+17
| | | |
* | | | Merge pull request #30417 from ↵Ryuta Kamizono2017-08-262-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_display_image Fix `can't modify frozen String` error in `display_image`
| * | | | Fix `can't modify frozen String` error in `display_image`yuuji.yaginuma2017-08-262-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `display_image` raises an error as follwing: ``` RuntimeError: can't modify frozen String rails/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb:72:in `display_image' rails/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb:40:in `block (2 levels) in <class:ScreenshotHelperTest>' ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 04:56:44 +0000