diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 15:06:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 15:06:41 +0000 |
commit | 083d64c6468a070ae7b0b406ead8d87da27d1d22 (patch) | |
tree | ba92a9b5b6418f805ede9ef05b371d82d2c1d27d /config | |
parent | 0be510a49f6e4f8e27b19b707fd1dac61571f78f (diff) | |
download | gitlab-ce-083d64c6468a070ae7b0b406ead8d87da27d1d22.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 5 | ||||
-rw-r--r-- | config/routes/project.rb | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 5d7c52c5d81..894e107e7da 100644 --- a/config/application.rb +++ b/config/application.rb @@ -247,7 +247,10 @@ module Gitlab end # Use caching across all environments + # Full list of options: + # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new caching_config_hash = Gitlab::Redis::Cache.params + caching_config_hash[:compress] = false caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever if Sidekiq.server? # threaded context @@ -255,7 +258,7 @@ module Gitlab caching_config_hash[:pool_timeout] = 1 end - config.cache_store = :redis_store, caching_config_hash + config.cache_store = :redis_cache_store, caching_config_hash config.active_job.queue_adapter = :sidekiq diff --git a/config/routes/project.rb b/config/routes/project.rb index ebd6b14be76..cc86e318dae 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -187,9 +187,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :import, only: [:new, :create, :show] resource :avatar, only: [:show, :destroy] - get 'grafana/proxy/:datasource_id/*proxy_path', - to: 'grafana_api#proxy', - as: :grafana_api + scope :grafana, as: :grafana_api do + get 'proxy/:datasource_id/*proxy_path', to: 'grafana_api#proxy' + get :metrics_dashboard, to: 'grafana_api#metrics_dashboard' + end end # End of the /-/ scope. |