Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-04 10:16:08 +0300
committerRémy Coutable <remy@rymai.me>2017-05-04 10:16:08 +0300
commit12c34c1cbbaeb107b826a52b784e0dc10f5a53ba (patch)
treef66400f63ea3c4664fb3c0cac449fbb692d083ef /lib
parent0f976727c4325e7837a051ae98dbe4215b12f6e0 (diff)
parent21f5515a5ffb46bb2e710c17690122903bca126e (diff)
Merge branch '31544-size-of-project-from-api' into 'master'
Resolve "Size of project from API" Closes #31544 See merge request !11013
Diffstat (limited to 'lib')
-rw-r--r--lib/api/projects.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index db4b31b55bc..1ba691cbea1 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -26,6 +26,10 @@ module API
params :optional_params do
use :optional_params_ce
end
+
+ params :statistics_params do
+ optional :statistics, type: Boolean, default: false, desc: 'Include project statistics'
+ end
end
resource :projects do
@@ -56,10 +60,6 @@ module API
optional :membership, type: Boolean, default: false, desc: 'Limit by projects that the current user is a member of'
end
- params :statistics_params do
- optional :statistics, type: Boolean, default: false, desc: 'Include project statistics'
- end
-
params :create_params do
optional :namespace_id, type: Integer, desc: 'Namespace ID for the new project. Default to the user namespace.'
optional :import_url, type: String, desc: 'URL from which the project is imported'
@@ -85,6 +85,7 @@ module API
end
params do
use :collection_params
+ use :statistics_params
end
get do
entity = current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails
@@ -151,10 +152,13 @@ module API
desc 'Get a single project' do
success Entities::ProjectWithAccess
end
+ params do
+ use :statistics_params
+ end
get ":id" do
entity = current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails
present user_project, with: entity, current_user: current_user,
- user_can_admin_project: can?(current_user, :admin_project, user_project)
+ user_can_admin_project: can?(current_user, :admin_project, user_project), statistics: params[:statistics]
end
desc 'Get events for a single project' do