summaryrefslogtreecommitdiff
path: root/lib/api/internal.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-10 23:07:35 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-13 09:41:55 +0200
commit1f72c387c97fdf08b5736c8f23a01d047bb8e512 (patch)
tree1335b5416c5530ea60f85226dc588acef6edbf6a /lib/api/internal.rb
parentbd8ff93c8c3bc918cf926a3108eaacbf2e3a093e (diff)
downloadgitlab-ce-1f72c387c97fdf08b5736c8f23a01d047bb8e512.tar.gz
Improve Git access error messages.
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r--lib/api/internal.rb26
1 files changed, 7 insertions, 19 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index f98a17773e7..e38736fc28b 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -24,10 +24,6 @@ module API
User.find_by(id: params[:user_id])
end
- unless actor
- return Gitlab::GitAccessStatus.new(false, 'No such user or key')
- end
-
project_path = params[:project]
# Check for *.wiki repositories.
@@ -39,22 +35,14 @@ module API
project = Project.find_with_namespace(project_path)
- if project
- access =
- if wiki
- Gitlab::GitAccessWiki.new(actor, project)
- else
- Gitlab::GitAccess.new(actor, project)
- end
-
- status = access.check(params[:action], params[:changes])
- end
+ access =
+ if wiki
+ Gitlab::GitAccessWiki.new(actor, project)
+ else
+ Gitlab::GitAccess.new(actor, project)
+ end
- if project && access.can_read_project?
- status
- else
- Gitlab::GitAccessStatus.new(false, 'No such project')
- end
+ access.check(params[:action], params[:changes])
end
#