Skip to content
Snippets Groups Projects
Commit 0d02b794 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'git_annex_fix' into 'master'

Fix leftover user checks for git_annex after refactoring

Fixes #291

See merge request !404
parents 1d3435d6 c490430f
No related branches found
No related tags found
3 merge requests!8889WIP: Port of 25624-anticipate-obstacles-to-removing-turbolinks to EE.,!7795Asciidoctor plantuml,!7793Add support for PlantUML diagrams in Asciidoc.
Loading
Loading
@@ -68,9 +68,7 @@ module Gitlab
when *PUSH_COMMANDS
push_access_check(changes)
when *GIT_ANNEX_COMMANDS
if actor.is_a? Key
git_annex_access_check(actor.user, project, changes)
end
git_annex_access_check(project, changes)
else
build_status_object(false, "The command you're trying to execute is not allowed.")
end
Loading
Loading
@@ -283,8 +281,8 @@ module Gitlab
GitAccessStatus.new(status, message)
end
 
def git_annex_access_check(user, project, changes)
unless user && user_allowed?(user)
def git_annex_access_check(project, changes)
unless user && user_allowed?
return build_status_object(false, "You don't have access")
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment