Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

3 files changed, 11 insertions, 3 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index ef8939bc5a9..d7f73354d4c 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -125,9 +125,9 @@ namespace :admin do
   end
 
   resource :application_settings, only: :update do
-    resources :services, only: [:index, :edit, :update]
     resources :integrations, only: [:edit, :update] do
       member do
+        get :overrides
         put :test
         post :reset
       end
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 72b3f04f5e5..1a21d7a8778 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -13,4 +13,5 @@ namespace :jira_connect do
   end
 
   resources :subscriptions, only: [:index, :create, :destroy]
+  resources :branches, only: [:new]
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 65cdb8bba96..8ba9c100f71 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -283,7 +283,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           resource :cycle_analytics, only: :show, path: 'value_stream_analytics'
           scope module: :cycle_analytics, as: 'cycle_analytics', path: 'value_stream_analytics' do
             resources :value_streams, only: [:index] do
-              resources :stages, only: [:index]
+              resources :stages, only: [:index] do
+                member do
+                  get :median
+                  get :average
+                  get :records
+                  get :count
+                end
+              end
             end
             resource :summary, controller: :summary, only: :show
           end
@@ -382,7 +389,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         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
-            resources :resized_image, only: :show, constraints: -> (params) { DesignManagement::DESIGN_IMAGE_SIZES.include?(params[:id]) }
+            resources :resized_image, only: :show, constraints: -> (params) { ::DesignManagement::DESIGN_IMAGE_SIZES.include?(params[:id]) }
           end
         end