Commit 971b3ee9 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '6678-extract-ee-specific-files-lines-for-platform-app-models' into 'master'

Resolve "Extract EE specific files/lines for Platform app/models"

Closes #6678

See merge request gitlab-org/gitlab-ee!9341
parents 5df4ec0a 2a7c1579
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
class ProtectedBranch < ActiveRecord::Base class ProtectedBranch < ActiveRecord::Base
include ProtectedRef include ProtectedRef
protected_ref_access_levels :merge, :push protected_ref_access_levels :merge, :push
def self.protected_ref_accessible_to?(ref, user, project:, action:, protected_refs: nil) def self.protected_ref_accessible_to?(ref, user, project:, action:, protected_refs: nil)
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
class ProtectedTag < ActiveRecord::Base class ProtectedTag < ActiveRecord::Base
include ProtectedRef include ProtectedRef
validates :name, uniqueness: { scope: :project_id } validates :name, uniqueness: { scope: :project_id }
protected_ref_access_levels :create protected_ref_access_levels :create
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment