aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #30323 from yhirano55/support_multiple_version_for_gem_methodMatthew Draper2017-08-313-9/+25
|\ \ \ \ | | | | | | | | | | Support multiple versions arguments for `gem` method of Generators
| * | | | Support multiple versions arguments for `gem` method of GeneratorsYoshiyuki Hirano2017-08-193-9/+25
| | | | |
* | | | | Merge pull request #30377 from keepcosmos/delegate-missing-methodsMatthew Draper2017-08-312-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Delegate :rindex, :slice, :rotate(missing) to 'records'
| * | | | | Delegate :rindex, :slice, :rotate to 'records'keepcosmos2017-08-242-4/+4
| | | | | |
* | | | | | Merge pull request #30392 from koic/unify_source_control_keep_file_nameMatthew Draper2017-08-312-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unify the internal source control .keep file name
| * | | | | | Unify the internal source control .keep file nameKoichi ITO2017-08-242-0/+0
| | | | | | |
* | | | | | | Merge pull request #30425 from ↵Matthew Draper2017-08-311-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wassimk/WAM-update-rubocop-to-latest-in-code-climate Run CodeClimate with the latest Rubocop
| * | | | | | | Run latest Rubocop in CodeClimateWassim Metallaoui2017-08-261-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #30477 from yhirano55/update_rdoc_mainMatthew Draper2017-08-311-42/+60
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Update RDOC_MAIN.rdoc
| * | | | | | | Update RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2017-08-311-42/+60
| | | | | | | |
* | | | | | | | Merge pull request #29964 from gwincr11/cg-partial-cachingEileen M. Uchitelle2017-08-301-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add documentation about template partial caching
| * | | | | | | | Add documentation about template partial cachingCory Gwin @gwincr112017-08-301-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: - #29423 surfaced some confusion about how template caching works when using partials across files with different mime types. This doc attempts to explain how this can be accomplished.
* | | | | | | | | Merge pull request #30462 from ↵Ryuta Kamizono2017-08-304-2/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_db_tasks Fix `can't modify frozen String` error in `DatabaseTasks`
| * | | | | | | | | Fix `can't modify frozen String` error in `DatabaseTasks`yuuji.yaginuma2017-08-304-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `db:structure:dump` task raises an error as follwing: ``` can't modify frozen String activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:77:in `run_cmd_error' activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:72:in `run_cmd' activerecord/lib/active_record/tasks/sqlite_database_tasks.rb:52:in `structure_dump' activerecord/lib/active_record/tasks/database_tasks.rb:219:in `structure_dump' activerecord/lib/active_record/railties/databases.rake:279:in `block (3 levels) in <main>' railties/lib/rails/commands/rake/rake_command.rb:23:in `block in perform' railties/lib/rails/commands/rake/rake_command.rb:20:in `perform' railties/lib/rails/command.rb:48:in `invoke' railties/lib/rails/commands.rb:18:in `<main>' ```
* | | | | | | | | | RefactorGeorge Claghorn2017-08-291-12/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #30460 from yhirano55/update_activejob_docRyuta Kamizono2017-08-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update activejob doc [ci skip]
| * | | | | | | | | Update activejob doc [ci skip]Yoshiyuki Hirano2017-08-301-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fix replacing a singular attachmentGeorge Claghorn2017-08-294-7/+50
| | | | | | | | |
* | | | | | | | | Merge pull request #30457 from yhirano55/update_action_mailer_docRyuta Kamizono2017-08-303-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Action Mailer doc [ci skip]
| * | | | | | | | | Update Action Mailer doc [ci skip]Yoshiyuki Hirano2017-08-303-8/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #30456 from yhirano55/update_activestorage_docsRyuta Kamizono2017-08-304-9/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update Active Storage docs [ci skip]
| * | | | | | | | Update Active Storage docs [ci skip]Yoshiyuki Hirano2017-08-304-9/+17
|/ / / / / / / /
* | | | | | | | Use YAML syntax highlight for `config/locales/en.yml` [ci skip]Ryuta Kamizono2017-08-291-1/+1
| | | | | | | |
* | | | | | | | It should be "the resulting cache key", not "the resulting `cache-key`" [ci ↵Ryuta Kamizono2017-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] This is a partial revert of 07402aa1307a4ff71b4ef6581f95b8612238a6af. I also changed "cache-key" to "cache key" because "cache-key" appears only once in the repo. ``` % git grep '\bcache-key\b' | wc -l 1 % git grep '\bcache key\b' | wc -l 28 ```
* | | | | | | | 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
|/ / / / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 07:24:51 +0000