kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Clean up non TODO rubocop errors

Browse source
This commit is contained in:
James Edwards-Jones 2017-04-03 20:06:06 +01:00
parent 35b719f60b
commit 9f4b8dba80
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/settings/repository_controller.rb
View file

@ -13,7 +13,7 @@ module Projects
def define_protected_refs
@protected_branches = @project.protected_branches.order(:name).page(params[:page])
@protected_tags = @project.protected_tags.order(:name).page(params[:page])
@protected_tags = @project.protected_tags.order(:name).page(params[:page]) #TODO duplicated pagination param?
@protected_branch = @project.protected_branches.new
@protected_tag = @project.protected_tags.new
load_gon_index

2
app/models/concerns/protected_ref.rb
View file

@ -18,8 +18,6 @@ module ProtectedRef
self.matching(ref).map(&:"@#{action}_access_levels").flatten
end
private
def self.matching(ref_name, protected_refs: nil)
ProtectedRefMatcher.matching(self, ref_name, protected_refs: protected_refs)
end

1
app/models/concerns/protected_ref_access.rb
View file

@ -1,3 +1,4 @@
#TODO: Refactor, checking EE
# module ProtectedRefAccess
# extend ActiveSupport::Concern

8
lib/gitlab/checks/change_access.rb
View file

@ -71,15 +71,15 @@ module Gitlab
def protected_tag_checks
return unless tag_protected?
if forced_push?
return "You are not allowed to force push protected tags." #TODO: Wording, 'not allowed to update proteted tags'?
if forced_push? #TODO: Verify if this should prevent all updates, and mention in UI and documentation
return "Protected tags cannot be updated."
end
if Gitlab::Git.blank_ref?(@newrev)
return "You are not allowed to delete protected tags." #TODO: Wording, do these need to mention 'you' if the rule applies to everyone
return "Protected tags cannot be deleted."
end
if !user_access.can_push_tag?(@tag_name)
unless user_access.can_push_tag?(@tag_name)
return "You are not allowed to create this tag as it is protected."
end
end

2
lib/gitlab/import_export/relation_factory.rb
View file

@ -7,7 +7,7 @@ module Gitlab
triggers: 'Ci::Trigger',
builds: 'Ci::Build',
hooks: 'ProjectHook',
merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
merge_access_levels: 'ProtectedBranch::MergeAccessLevel', #TODO: Tags
push_access_levels: 'ProtectedBranch::PushAccessLevel',
labels: :project_labels,
priorities: :label_priorities,

12
spec/controllers/projects/protected_tags_controller_spec.rb
View file

@ -1,10 +1,10 @@
require('spec_helper')
describe Projects::ProtectedTagsController do
# describe "GET #index" do
# let(:project) { create(:project_empty_repo, :public) }
# it "redirects empty repo to projects page" do
# get(:index, namespace_id: project.namespace.to_param, project_id: project)
# end
# end
describe "GET #index" do
let(:project) { create(:project_empty_repo, :public) }
it "redirects empty repo to projects page" do
get(:index, namespace_id: project.namespace.to_param, project_id: project)
end
end
end