Add latest changes from gitlab-org/gitlab@master

6 files changed, 40 insertions, 49 deletions

diff --git a/app/controllers/concerns/dependency_proxy/group_access.rb b/app/controllers/concerns/dependency_proxy/group_access.rb
index 07aca72b22f..44611641529 100644
--- a/app/controllers/concerns/dependency_proxy/group_access.rb
+++ b/app/controllers/concerns/dependency_proxy/group_access.rb
@@ -5,13 +5,13 @@ module DependencyProxy
     extend ActiveSupport::Concern
 
     included do
-      before_action :verify_dependency_proxy_enabled!
+      before_action :verify_dependency_proxy_available!
       before_action :authorize_read_dependency_proxy!
     end
 
     private
 
-    def verify_dependency_proxy_enabled!
+    def verify_dependency_proxy_available!
       render_404 unless group&.dependency_proxy_feature_available?
     end
 
diff --git a/app/controllers/groups/dependency_proxies_controller.rb b/app/controllers/groups/dependency_proxies_controller.rb
index b037aa52939..2e120de435e 100644
--- a/app/controllers/groups/dependency_proxies_controller.rb
+++ b/app/controllers/groups/dependency_proxies_controller.rb
@@ -5,30 +5,19 @@ module Groups
     include ::DependencyProxy::GroupAccess
 
     before_action :authorize_admin_dependency_proxy!, only: :update
-    before_action :dependency_proxy
+    before_action :verify_dependency_proxy_enabled!
 
     feature_category :package_registry
 
-    def show
-      @blobs_count = group.dependency_proxy_blobs.count
-      @blobs_total_size = group.dependency_proxy_blobs.total_size
-    end
-
-    def update
-      dependency_proxy.update(dependency_proxy_params)
-
-      redirect_to group_dependency_proxy_path(group)
-    end
-
     private
 
     def dependency_proxy
       @dependency_proxy ||=
-        group.dependency_proxy_setting || group.create_dependency_proxy_setting
+        group.dependency_proxy_setting || group.create_dependency_proxy_setting!
     end
 
-    def dependency_proxy_params
-      params.require(:dependency_proxy_group_setting).permit(:enabled)
+    def verify_dependency_proxy_enabled!
+      render_404 unless dependency_proxy.enabled?
     end
   end
 end
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index 81b8da9cba3..32a192192bd 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -4,8 +4,8 @@ class Projects::JobsController < Projects::ApplicationController
   include SendFileUpload
   include ContinueParams
 
-  before_action :find_job_as_build, except: [:index, :play]
-  before_action :find_job_as_processable, only: [:play]
+  before_action :find_job_as_build, except: [:index, :play, :show]
+  before_action :find_job_as_processable, only: [:play, :show]
   before_action :authorize_read_build_trace!, only: [:trace, :raw]
   before_action :authorize_read_build!
   before_action :authorize_update_build!,
diff --git a/app/controllers/user_callouts_controller.rb b/app/controllers/user_callouts_controller.rb
deleted file mode 100644
index f52a09adf5a..00000000000
--- a/app/controllers/user_callouts_controller.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class UserCalloutsController < ApplicationController
-  feature_category :navigation
-
-  def create
-    if callout.persisted?
-      respond_to do |format|
-        format.json { head :ok }
-      end
-    else
-      respond_to do |format|
-        format.json { head :bad_request }
-      end
-    end
-  end
-
-  private
-
-  def callout
-    Users::DismissUserCalloutService.new(
-      container: nil, current_user: current_user, params: { feature_name: feature_name }
-    ).execute
-  end
-
-  def feature_name
-    params.require(:feature_name)
-  end
-end
diff --git a/app/controllers/users/callouts_controller.rb b/app/controllers/users/callouts_controller.rb
new file mode 100644
index 00000000000..fe308d9dd1e
--- /dev/null
+++ b/app/controllers/users/callouts_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Users
+  class CalloutsController < ApplicationController
+    feature_category :navigation
+
+    def create
+      if callout.persisted?
+        respond_to do |format|
+          format.json { head :ok }
+        end
+      else
+        respond_to do |format|
+          format.json { head :bad_request }
+        end
+      end
+    end
+
+    private
+
+    def callout
+      Users::DismissCalloutService.new(
+        container: nil, current_user: current_user, params: { feature_name: feature_name }
+      ).execute
+    end
+
+    def feature_name
+      params.require(:feature_name)
+    end
+  end
+end
diff --git a/app/controllers/users/group_callouts_controller.rb b/app/controllers/users/group_callouts_controller.rb
index cc27452e6a3..abca12ccea7 100644
--- a/app/controllers/users/group_callouts_controller.rb
+++ b/app/controllers/users/group_callouts_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Users
-  class GroupCalloutsController < UserCalloutsController
+  class GroupCalloutsController < Users::CalloutsController
     private
 
     def callout