Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 0 deletions

diff --git a/config/feature_flags/development/gldropdown_branches.yml b/config/feature_flags/development/gldropdown_branches.yml
new file mode 100644
index 00000000000..f209926eb26
--- /dev/null
+++ b/config/feature_flags/development/gldropdown_branches.yml
@@ -0,0 +1,8 @@
+---
+name: gldropdown_branches
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57760
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326549
+milestone: '13.11'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/routes.rb b/config/routes.rb
index c7537671336..c21c920117f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -220,6 +220,12 @@ Rails.application.routes.draw do
         post :authorize_aws_role
       end
 
+      resource :integration, controller: 'clusters/integrations', only: [] do
+        collection do
+          post :create_or_update
+        end
+      end
+
       member do
         Gitlab.ee do
           get :metrics, format: :json