diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 21:09:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 21:09:09 +0300 |
| commit | fb994e98ecce2a1f1dfaa87c9c3de8535815813b (patch) | |
| tree | 0a0915d6a0dcd22aab31d2f89c72c85597aa5b86 /config | |
| parent | 51858218a3961c6d872703eabde0635bc0a1368f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/improved_merge_diff_highlighting.yml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 146cdd4f5a7..50d394859bc 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,13 @@ Rails.application.configure do # Show full error reports and disable caching config.active_record.verbose_query_logs = true config.consider_all_requests_local = true - config.action_controller.perform_caching = false + + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + config.action_controller.enable_fragment_cache_logging = true + else + config.action_controller.perform_caching = false + end # Show a warning when a large data set is loaded into memory config.active_record.warn_on_records_fetched_greater_than = 1000 diff --git a/config/feature_flags/development/improved_merge_diff_highlighting.yml b/config/feature_flags/development/improved_merge_diff_highlighting.yml index 61978ff48da..b397405a12c 100644 --- a/config/feature_flags/development/improved_merge_diff_highlighting.yml +++ b/config/feature_flags/development/improved_merge_diff_highlighting.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299884 milestone: '13.9' type: development group: group::source code -default_enabled: false +default_enabled: true |