kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Build options hash after finding the list of projects 

Because this order makes more sense and makes the code easier to read.
This commit is contained in:
Toon Claes 2017-05-22 16:48:38 +02:00
parent 44fdf0a1e3
commit 4fda13b68e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/api/projects.rb
View File

@ -68,16 +68,17 @@ module API
end
def present_projects(options = {})
options = options.reverse_merge(
with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
current_user: current_user
)
projects = ProjectsFinder.new(current_user: current_user).execute
projects = filter_projects(projects)
projects = projects.with_statistics if params[:statistics]
projects = projects.with_issues_enabled if params[:with_issues_enabled]
projects = projects.with_merge_requests_enabled if params[:with_merge_requests_enabled]
options = options.reverse_merge(
with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
statistics: params[:statistics],
current_user: current_user
)
options[:with] = Entities::BasicProjectDetails if params[:simple]
present paginate(projects), options