diff options
author | James Lopez <james@jameslopez.es> | 2016-04-22 17:02:29 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-04-22 17:02:29 +0200 |
commit | b18bd9c85f0d925aaa6ecf531673958bd97082fc (patch) | |
tree | eea201c9c521ad35592774b773d6741fd6e43f92 /config | |
parent | a0ede57dd68e16eb030da388bcfd130eed127494 (diff) | |
parent | a600b4b1c08c374e336cbd4226d2ff77c8ff9cca (diff) | |
download | gitlab-ce-b18bd9c85f0d925aaa6ecf531673958bd97082fc.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/metrics.rb | 4 | ||||
-rw-r--r-- | config/routes.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 22fe51a4534..283936d0efc 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -107,6 +107,10 @@ if Gitlab::Metrics.enabled? config.instrument_methods(const) config.instrument_instance_methods(const) end + + # Instrument the classes used for checking if somebody has push access. + config.instrument_instance_methods(Gitlab::GitAccess) + config.instrument_instance_methods(Gitlab::GitAccessWiki) end GC::Profiler.enable diff --git a/config/routes.rb b/config/routes.rb index a18190d8bcb..c361684dfe3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -418,6 +418,7 @@ Rails.application.routes.draw do devise_scope :user do get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error + get '/users/almost_there' => 'confirmations#almost_there' end root to: "root#index" |