diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-03 11:46:53 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-03 11:46:53 +0300 |
| commit | 1bbeafc3e1a0e4472a0d8124c9d4711356cde2d0 (patch) | |
| tree | 1223af9ebd60b51e1903d0c27d716d1ff5bae639 /config | |
| parent | 4477f7bb5925d8d720e3e8272bd882fffcc04b28 (diff) | |
| parent | d51ad1ea6407d3cb9eafd9fc891c7348b10b108f (diff) | |
Merge remote-tracking branch 'origin/master' into 38464-k8s-apps
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/8_metrics.rb | 4 | ||||
| -rw-r--r-- | config/locales/doorkeeper.en.yml | 5 | ||||
| -rw-r--r-- | config/routes/profile.rb | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index e1a59d8c152..2d8704622b6 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -123,7 +123,9 @@ def instrument_classes(instrumentation) end # rubocop:enable Metrics/AbcSize -Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start +unless Sidekiq.server? + Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start +end Gitlab::Application.configure do |config| # 0 should be Sentry to catch errors in this middleware diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 14d49885fb3..0da6b14c29e 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -58,9 +58,10 @@ en: expired: "The access token expired" unknown: "The access token is invalid" scopes: - api: Access your API - read_user: Read user information + api: Access the authenticated user's API + read_user: Read the authenticated user's personal information openid: Authenticate using OpenID Connect + sudo: Perform API actions as any user in the system (if the authenticated user is an admin) flash: applications: diff --git a/config/routes/profile.rb b/config/routes/profile.rb index ddc852f0132..bcfc17a5f66 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -6,7 +6,6 @@ resource :profile, only: [:show, :update] do get :audit_log get :applications, to: 'oauth/applications#index' - put :reset_private_token put :reset_incoming_email_token put :reset_rss_token put :update_username |