Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

5 files changed, 24 insertions, 0 deletions

diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb
index 29e0d65b58c..0f973867068 100644
--- a/config/routes/merge_requests.rb
+++ b/config/routes/merge_requests.rb
@@ -17,7 +17,10 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show],
     get :accessibility_reports
     get :coverage_reports
     get :terraform_reports
+
+    # documented in doc/development/rails_endpoints/index.md
     get :codequality_reports
+    # documented in doc/development/rails_endpoints/index.md
     get :codequality_mr_diff_reports
 
     scope constraints: ->(req) { req.format == :json }, as: :json do
diff --git a/config/routes/organizations.rb b/config/routes/organizations.rb
new file mode 100644
index 00000000000..c35059cf411
--- /dev/null
+++ b/config/routes/organizations.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+resources :organizations, only: [], param: :organization_path, controller: 'organizations/organizations' do
+  member do
+    get :directory
+  end
+end
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index f42f6a9037d..73c8d63b8ec 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -39,6 +39,13 @@ resource :profile, only: [:show, :update] do
         put :reset
       end
     end
+
+    resource :slack, only: [:edit] do
+      member do
+        get :slack_link
+      end
+    end
+
     resource :preferences, only: [:show, :update]
 
     resources :comment_templates, only: [:index, :show], action: :index
diff --git a/config/routes/project.rb b/config/routes/project.rb
index f296143dca8..bf73f461629 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -144,6 +144,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
 
+          resource :slack, only: [:destroy, :edit, :update] do
+            get :slack_auth
+          end
+
           resource :repository, only: [:show, :update], controller: :repository do
             # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14
             # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356
diff --git a/config/routes/well_known.rb b/config/routes/well_known.rb
new file mode 100644
index 00000000000..0c48f116da9
--- /dev/null
+++ b/config/routes/well_known.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+get '/.well-known/change-password', to: redirect('-/profile/password/edit'), status: 302