diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-11 21:10:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-11 21:10:34 +0300 |
| commit | 5842aa35563dacaabf9a80307966fabe366a1321 (patch) | |
| tree | 76a34e30f26c3e0f44410cadc308c301d49858ce /config | |
| parent | f4ad4d190044bd14fe4caec25b1a219887bc752f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/observability_tracing.yml | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/packages_dependency_proxy_maven.yml | 8 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/config/feature_flags/development/observability_tracing.yml b/config/feature_flags/development/observability_tracing.yml new file mode 100644 index 00000000000..a32d8409608 --- /dev/null +++ b/config/feature_flags/development/observability_tracing.yml @@ -0,0 +1,8 @@ +--- +name: observability_tracing +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124966 +rollout_issue_url: https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/2252 +milestone: '16.2' +type: development +group: group::observability +default_enabled: false diff --git a/config/feature_flags/development/packages_dependency_proxy_maven.yml b/config/feature_flags/development/packages_dependency_proxy_maven.yml new file mode 100644 index 00000000000..8cf2f5a2879 --- /dev/null +++ b/config/feature_flags/development/packages_dependency_proxy_maven.yml @@ -0,0 +1,8 @@ +--- +name: packages_dependency_proxy_maven +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123491 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415218 +milestone: '16.2' +type: development +group: group::package registry +default_enabled: false diff --git a/config/routes/project.rb b/config/routes/project.rb index 533e6c63e24..787d95669d1 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -404,6 +404,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + resources :tracing, only: [:index], controller: :tracing + namespace :design_management do namespace :designs, path: 'designs/:design_id(/:sha)', constraints: -> (params) { params[:sha].nil? || Gitlab::Git.commit_id?(params[:sha]) } do resource :raw_image, only: :show |