diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 21:07:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 21:07:51 +0300 |
commit | cea01cb81787f0d2c119b287a5833f2e267324bc (patch) | |
tree | ca37d57c1ec57ef2fa475e6489c4c107cce89dbc /config | |
parent | ee24c7d68f57a67754a5d1e2ea99f688029d14bd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_flags/development/create_runner_workflow.yml (renamed from config/feature_flags/development/ci_reuse_build_in_seed_context.yml) | 10 | ||||
-rw-r--r-- | config/feature_flags/ops/disable_anonymous_search.yml | 8 | ||||
-rw-r--r-- | config/routes/admin.rb | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/config/feature_flags/development/ci_reuse_build_in_seed_context.yml b/config/feature_flags/development/create_runner_workflow.yml index aa63b8d898f..1a0c8b3e847 100644 --- a/config/feature_flags/development/ci_reuse_build_in_seed_context.yml +++ b/config/feature_flags/development/create_runner_workflow.yml @@ -1,8 +1,8 @@ --- -name: ci_reuse_build_in_seed_context -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105492 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384577 -milestone: '15.7' +name: create_runner_workflow +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109497 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389269 +milestone: '15.9' type: development -group: group::pipeline execution +group: group::runner default_enabled: false diff --git a/config/feature_flags/ops/disable_anonymous_search.yml b/config/feature_flags/ops/disable_anonymous_search.yml deleted file mode 100644 index a49b4c168e1..00000000000 --- a/config/feature_flags/ops/disable_anonymous_search.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: disable_anonymous_search -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70223 -rollout_issue_url: -milestone: '14.3' -type: ops -group: group::project management -default_enabled: false diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 2f4e286f5eb..6d1c3c661c0 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -165,7 +165,7 @@ namespace :admin do resources :labels - resources :runners, only: [:index, :show, :edit, :update, :destroy] do + resources :runners, only: [:index, :new, :show, :edit, :update, :destroy] do member do post :resume post :pause |