diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-08 18:09:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-08 18:09:45 +0300 |
| commit | 4f0f7d580907e598013ad4b445db60ceacaa4724 (patch) | |
| tree | 96f8b3224f962ff7011611cfdfa65bdbe079c5cd /config | |
| parent | 148b75b329294f6b6ae409bbf8d70590e63c6bc9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/feature_flags/development/codequality_mr_diff.yml (renamed from config/feature_flags/development/ci_job_line_links.yml) | 12 | ||||
| -rw-r--r-- | config/feature_flags/development/vue_2fa_recovery_codes.yml | 8 | ||||
| -rw-r--r-- | config/routes/merge_requests.rb | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index 89dc2ec7e25..ba896be894b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -197,6 +197,7 @@ module Gitlab config.assets.precompile << "page_bundles/pipelines.css" config.assets.precompile << "page_bundles/pipeline_schedules.css" config.assets.precompile << "page_bundles/productivity_analytics.css" + config.assets.precompile << "page_bundles/profile_two_factor_auth.css" config.assets.precompile << "page_bundles/terminal.css" config.assets.precompile << "page_bundles/todos.css" config.assets.precompile << "page_bundles/reports.css" diff --git a/config/feature_flags/development/ci_job_line_links.yml b/config/feature_flags/development/codequality_mr_diff.yml index e14dd82833e..ca6846b9390 100644 --- a/config/feature_flags/development/ci_job_line_links.yml +++ b/config/feature_flags/development/codequality_mr_diff.yml @@ -1,8 +1,8 @@ --- -name: ci_job_line_links -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47532 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281727 -milestone: '13.6' +name: codequality_mr_diff +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47938 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284140 +milestone: '13.7' type: development -group: group::continuous integration -default_enabled: true +group: group::testing +default_enabled: false diff --git a/config/feature_flags/development/vue_2fa_recovery_codes.yml b/config/feature_flags/development/vue_2fa_recovery_codes.yml new file mode 100644 index 00000000000..37119bcfe8a --- /dev/null +++ b/config/feature_flags/development/vue_2fa_recovery_codes.yml @@ -0,0 +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' +type: development +group: group::access +default_enabled: false diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb index c11e5a5c3d9..41d831f239e 100644 --- a/config/routes/merge_requests.rb +++ b/config/routes/merge_requests.rb @@ -17,6 +17,7 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show], get :accessibility_reports get :coverage_reports get :terraform_reports + get :codequality_reports scope constraints: ->(req) { req.format == :json }, as: :json do get :commits |