summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorvanadium23 <chernoffivan@gmail.com>2017-06-29 20:20:59 +0300
committervanadium23 <chernoffivan@gmail.com>2017-07-06 08:04:54 +0300
commit8d44d5142ae8a5e00b8417d2db8a7627fea0ef57 (patch)
tree01f8665234bbb169ce44a4a955a34436b8af96fa /lib/api/helpers.rb
parent462b1ed99d729c3ede32d00fbac042ecb32268b1 (diff)
downloadgitlab-ce-8d44d5142ae8a5e00b8417d2db8a7627fea0ef57.tar.gz
Add user projects API
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index a2a661b205c..0f4791841d2 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -268,6 +268,7 @@ module API
finder_params[:visibility_level] = Gitlab::VisibilityLevel.level_value(params[:visibility]) if params[:visibility]
finder_params[:archived] = params[:archived]
finder_params[:search] = params[:search] if params[:search]
+ finder_params[:user] = params.delete(:user) if params[:user]
finder_params
end
@@ -313,7 +314,7 @@ module API
def present_artifacts!(artifacts_file)
return not_found! unless artifacts_file.exists?
-
+
if artifacts_file.file_storage?
present_file!(artifacts_file.path, artifacts_file.filename)
else