summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-10-09 17:05:51 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-10-09 17:05:51 +0200
commit59c6ddcdefb813487d552499ebcb5504b5fde548 (patch)
tree0f3bdcf9b219d7c83b8d2409cbe6f7d6b1460d12
parent5f41cddf80b5bcf7b409e200b21cd26761ad9afd (diff)
downloadgitlab-ce-59c6ddcdefb813487d552499ebcb5504b5fde548.tar.gz
Fix for Lint Error + Upload Test
-rw-r--r--app/helpers/groups_helper.rb1
-rw-r--r--spec/models/project_spec.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 655b9d02c1e..f5ef9c53a7a 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -1,5 +1,4 @@
module GroupsHelper
-
def can_change_group_visibility_level?(group)
can?(current_user, :change_visibility_level, group)
end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 176bb568cbe..fef89999b85 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -844,7 +844,7 @@ describe Project do
let(:project) { create(:project) }
context 'when avatar file is uploaded' do
- let(:project) { create(:project, :with_avatar) }
+ let(:project) { create(:project, :public, :with_avatar) }
let(:avatar_path) { "/uploads/-/system/project/avatar/#{project.id}/dk.png" }
let(:gitlab_host) { "http://#{Gitlab.config.gitlab.host}" }