Commit 94ed78fc authored by Rémy Coutable's avatar Rémy Coutable

Fix a wrongly named migration and namespace an EE-specific policy

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 1da19431
module EE
module ProjectPolicy
def disabled_features!
raise NotImplementedError unless defined?(super)
super
if License.block_changes?
cannot! :create_issue
cannot! :create_merge_request
cannot! :push_code
cannot! :push_code_to_protected_branches
end
end
end
end
class ProjectPolicy < BasePolicy class ProjectPolicy < BasePolicy
prepend EE::ProjectPolicy
def rules def rules
team_access!(user) team_access!(user)
...@@ -267,19 +269,4 @@ class ProjectPolicy < BasePolicy ...@@ -267,19 +269,4 @@ class ProjectPolicy < BasePolicy
:"admin_#{name}" :"admin_#{name}"
] ]
end end
# EE-specific
module EeDisabledFeaturePermissions
def disabled_features!
super
if License.block_changes?
cannot! :create_issue
cannot! :create_merge_request
cannot! :push_code
cannot! :push_code_to_protected_branches
end
end
end
prepend EeDisabledFeaturePermissions
end end
# See http://doc.gitlab.com/ce/development/migration_style_guide.html # See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab. # for more information on how to write migrations for GitLab.
class MigrateEeSidekiqQueuesFromDefault < ActiveRecord::Migration class MigrateEESidekiqQueuesFromDefault < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers include Gitlab::Database::MigrationHelpers
DOWNTIME = true DOWNTIME = true
......
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