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

4 files changed, 1 insertions, 18 deletions

diff --git a/app/services/releases/base_service.rb b/app/services/releases/base_service.rb
index b4b493624e7..249333e6d13 100644
--- a/app/services/releases/base_service.rb
+++ b/app/services/releases/base_service.rb
@@ -83,15 +83,6 @@ module Releases
       release.execute_hooks(action)
     end
 
-    def track_protected_tag_access_error!
-      unless ::Gitlab::UserAccess.new(current_user, container: project).can_create_tag?(tag_name)
-        Gitlab::ErrorTracking.log_exception(
-          ReleaseProtectedTagAccessError.new,
-          project_id: project.id,
-          user_id: current_user.id)
-      end
-    end
-
     # overridden in EE
     def project_group_id; end
   end
diff --git a/app/services/releases/create_service.rb b/app/services/releases/create_service.rb
index 2aac5644b84..caa6a003205 100644
--- a/app/services/releases/create_service.rb
+++ b/app/services/releases/create_service.rb
@@ -7,8 +7,6 @@ module Releases
       return error('Release already exists', 409) if release
       return error("Milestone(s) not found: #{inexistent_milestones.join(', ')}", 400) if inexistent_milestones.any?
 
-      track_protected_tag_access_error!
-
       # should be found before the creation of new tag
       # because tag creation can spawn new pipeline
       # which won't have any data for evidence yet
@@ -48,8 +46,6 @@ module Releases
     end
 
     def can_create_tag?
-      return true unless ::Feature.enabled?(:evalute_protected_tag_for_release_permissions, project, default_enabled: :yaml)
-
       ::Gitlab::UserAccess.new(current_user, container: project).can_create_tag?(tag_name)
     end
 
diff --git a/app/services/releases/destroy_service.rb b/app/services/releases/destroy_service.rb
index 36cf29c955d..8abf9308689 100644
--- a/app/services/releases/destroy_service.rb
+++ b/app/services/releases/destroy_service.rb
@@ -6,8 +6,6 @@ module Releases
       return error('Release does not exist', 404) unless release
       return error('Access Denied', 403) unless allowed?
 
-      track_protected_tag_access_error!
-
       if release.destroy
         success(tag: existing_tag, release: release)
       else
diff --git a/app/services/releases/update_service.rb b/app/services/releases/update_service.rb
index eda4b7102c0..2e0a2f8488a 100644
--- a/app/services/releases/update_service.rb
+++ b/app/services/releases/update_service.rb
@@ -7,8 +7,6 @@ module Releases
         return error
       end
 
-      track_protected_tag_access_error!
-
       if param_for_milestone_titles_provided?
         previous_milestones = release.milestones.map(&:title)
         params[:milestones] = milestones
@@ -18,7 +16,7 @@ module Releases
       # when it does assign_attributes instead of actual saving
       # this leads to the validation error being raised
       # see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43385
-      ActiveRecord::Base.transaction do
+      ApplicationRecord.transaction do
         if release.update(params)
           execute_hooks(release, 'update')
           success(tag: existing_tag, release: release, milestones_updated: milestones_updated?(previous_milestones))