diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 21:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-04 21:09:22 +0300 |
| commit | 7c221ba5ce130ca50b892e6dd32783e1327718df (patch) | |
| tree | 2c11d688f89886c8ea37638061fe450c8b656e47 /config | |
| parent | da602b32e45431234e592e8f7001c3ace1771765 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
4 files changed, 27 insertions, 0 deletions
diff --git a/config/feature_flags/development/ci_accept_frontend_prometheus_metrics.yml b/config/feature_flags/development/ci_accept_frontend_prometheus_metrics.yml new file mode 100644 index 00000000000..b795b2505d8 --- /dev/null +++ b/config/feature_flags/development/ci_accept_frontend_prometheus_metrics.yml @@ -0,0 +1,8 @@ +--- +name: ci_accept_frontend_prometheus_metrics +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52820 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300770 +milestone: '13.9' +type: development +group: group::pipeline authoring +default_enabled: false diff --git a/config/feature_flags/development/codequality_backend_comparison.yml b/config/feature_flags/development/codequality_backend_comparison.yml new file mode 100644 index 00000000000..f7c3c14f674 --- /dev/null +++ b/config/feature_flags/development/codequality_backend_comparison.yml @@ -0,0 +1,8 @@ +--- +name: codequality_backend_comparison +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53068 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300796 +milestone: '13.9' +type: development +group: group::testing +default_enabled: false diff --git a/config/feature_flags/development/issue_rebalancing_optimization.yml b/config/feature_flags/development/issue_rebalancing_optimization.yml new file mode 100644 index 00000000000..abaeb53f63d --- /dev/null +++ b/config/feature_flags/development/issue_rebalancing_optimization.yml @@ -0,0 +1,8 @@ +--- +name: issue_rebalancing_optimization +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53384 +rollout_issue_url: +milestone: '13.9' +type: development +group: group::project management +default_enabled: false diff --git a/config/routes/project.rb b/config/routes/project.rb index c74d0c19d35..97834894ad1 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -87,6 +87,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :lint, only: [:show, :create] resource :pipeline_editor, only: [:show], controller: :pipeline_editor, path: 'editor' resources :daily_build_group_report_results, only: [:index], constraints: { format: /(csv|json)/ } + namespace :prometheus_metrics do + resources :histograms, only: [:create], constraints: { format: 'json' } + end end namespace :settings do |