aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Have attachments touch their recordsGeorge Claghorn2017-08-311-1/+1
* Merge pull request #30490 from y-yagi/fix_cant_modify_forzen_string_error_in_...Richard Schneeman2017-08-311-1/+1
|\
| * Fix `can't modify frozen String` error in `XmlMini_JDOM`yuuji.yaginuma2017-09-011-1/+1
* | Merge pull request #30486 from rosa/ignore-deleted-gcs-files-on-deletionGeorge Claghorn2017-08-311-1/+5
|\ \
| * | Ignore files already deleted on GCS file deletionsRosa Gutierrez2017-08-311-1/+5
|/ /
* | Merge pull request #30481 from Persola/masterRyuta Kamizono2017-08-311-1/+1
|\ \ | |/ |/|
| * In Action View Overview guide, remove reference to custom helpersLuke Persola2017-08-301-1/+1
* | 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 GeneratorsYoshiyuki Hirano2017-08-193-9/+25
* | | Merge pull request #30377 from keepcosmos/delegate-missing-methodsMatthew Draper2017-08-312-4/+4
|\ \ \
| * | | 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 nameKoichi ITO2017-08-242-0/+0
* | | | | Merge pull request #30425 from wassimk/WAM-update-rubocop-to-latest-in-code-c...Matthew Draper2017-08-311-0/+1
|\ \ \ \ \
| * | | | | 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 [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 cachingCory Gwin @gwincr112017-08-301-3/+21
* | | | | | | Merge pull request #30462 from y-yagi/fix_cant_modify_forzen_string_error_in_...Ryuta Kamizono2017-08-304-2/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix `can't modify frozen String` error in `DatabaseTasks`yuuji.yaginuma2017-08-304-2/+37
* | | | | | | | 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]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]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]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 s...Ryuta Kamizono2017-08-291-1/+1
* | | | | | Add stopgap_13632 workaroundMatthew Draper2017-08-292-0/+6
* | | | | | Merge pull request #30447 from yhirano55/update_caching_with_railsEileen M. Uchitelle2017-08-291-3/+3
|\ \ \ \ \ \
| * | | | | | Update Caching with Rails guide [ci skip]Yoshiyuki Hirano2017-08-291-3/+3
* | | | | | | Merge pull request #30451 from y-yagi/fix_cant_modify_forzen_string_error_in_...Ryuta Kamizono2017-08-292-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix `can't modify frozen String` error in `DBConsole`yuuji.yaginuma2017-08-292-1/+7
|/ / / / / / /
* | | | | | | Merge pull request #30439 from prathamesh-sonpatki/changelog-30360Ryuta Kamizono2017-08-291-0/+5
|\ \ \ \ \ \ \
| * | | | | | | 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]Yoshiyuki Hirano2017-08-291-10/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #30433 from y-yagi/fix_cant_modify_forzen_string_error_in_...Ryuta Kamizono2017-08-292-7/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix `warning: shadowing outer local variable`yuuji.yaginuma2017-08-281-3/+3
| * | | | | | | | Fix `can't modify frozen String` error in `DebugLocks`yuuji.yaginuma2017-08-282-4/+42
* | | | | | | | | 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 [ci skip]Prathamesh Sonpatki2017-08-291-0/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #30370 from yhirano55/fix_indentation_in_secrets_yaml_temp...Kasper Timm Hansen2017-08-283-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | 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