diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 15:10:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 15:10:27 +0300 |
| commit | 39c1496527de559d5d3a5c3b53d11575f435a4dc (patch) | |
| tree | 51ed818b49752bb27d8bc7a13e9efcb3e5192c1f /config | |
| parent | ab9c1dbb2dc0e591a6ce4466e15766d99f4abf4b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_pipeline_open_merge_requests.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/jira_sync_feature_flags.yml (renamed from config/feature_flags/development/vue_2fa_recovery_codes.yml) | 12 | ||||
| -rw-r--r-- | config/feature_flags/development/unified_diff_components.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml index d50e49b6aa1..7e2ae1edd34 100644 --- a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml +++ b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292727 milestone: '13.7' group: group::memory type: development -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/vue_2fa_recovery_codes.yml b/config/feature_flags/development/jira_sync_feature_flags.yml index 7995b00f9ab..c5925766919 100644 --- a/config/feature_flags/development/vue_2fa_recovery_codes.yml +++ b/config/feature_flags/development/jira_sync_feature_flags.yml @@ -1,8 +1,8 @@ --- -name: vue_2fa_recovery_codes -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49078 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113 -milestone: '13.7' +name: jira_sync_feature_flags +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50390 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296990 +milestone: '13.8' type: development -group: group::access -default_enabled: true +group: group::ecosystem +default_enabled: false diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml index 68a1cd8996f..0176d8c55ba 100644 --- a/config/feature_flags/development/unified_diff_components.yml +++ b/config/feature_flags/development/unified_diff_components.yml @@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44974 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268039 type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/config/routes.rb b/config/routes.rb index 3ba78ead0a8..16e833ede71 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -92,7 +92,10 @@ Rails.application.routes.draw do # '/-/health' implemented by BasicHealthCheck middleware get 'liveness' => 'health#liveness' get 'readiness' => 'health#readiness' - resources :metrics, only: [:index] + controller :metrics do + get 'metrics', action: :index + get 'metrics/system', action: :system + end mount Peek::Railtie => '/peek', as: 'peek_routes' get 'runner_setup/platforms' => 'runner_setup#platforms' |