diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-07 21:09:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-07 21:09:58 +0000 |
| commit | 919e3e3cd83e76dba137ef9bcc4746214c2085ff (patch) | |
| tree | 4e9799b9c6193583896ea1f05137815ff9782796 /config | |
| parent | 6cae2159b8ce1e84fad48f3dbd5368995cbd87b1 (diff) | |
| download | gitlab-ce-919e3e3cd83e76dba137ef9bcc4746214c2085ff.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/preferred_language_switcher.yml | 7 | ||||
| -rw-r--r-- | config/routes/import.rb | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/config/feature_flags/development/preferred_language_switcher.yml b/config/feature_flags/development/preferred_language_switcher.yml deleted file mode 100644 index 9dedb1421aa..00000000000 --- a/config/feature_flags/development/preferred_language_switcher.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -name: preferred_language_switcher -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101621 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381181 -milestone: '15.6' -type: development -default_enabled: false diff --git a/config/routes/import.rb b/config/routes/import.rb index b319e6ca223..2513cd04cfb 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -22,6 +22,7 @@ namespace :import do get :callback get :realtime_changes post :cancel + post :cancel_all end resource :gitea, only: [:create, :new], controller: :gitea do |