summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-07-12 17:32:40 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-07-12 17:32:40 +0100
commit563b303bde6701fc91351701db651e8da68f9b80 (patch)
treea293f677e4925fea7c26257b5dc65aa291548e8e
parentb4a919ab9e6c5e008828a8109b7dc9276cc875d5 (diff)
downloadgitlab-ce-563b303bde6701fc91351701db651e8da68f9b80.tar.gz
removes basicprojectwithaccess and replaces it with basicprojectdetails
-rw-r--r--lib/api/.projects.rb.swnbin0 -> 28672 bytes
-rw-r--r--lib/api/entities.rb8
-rw-r--r--lib/api/projects.rb2
3 files changed, 1 insertions, 9 deletions
diff --git a/lib/api/.projects.rb.swn b/lib/api/.projects.rb.swn
new file mode 100644
index 00000000000..890811564d2
--- /dev/null
+++ b/lib/api/.projects.rb.swn
Binary files differ
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b62afb4bb4c..8e03c08f47b 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -342,14 +342,6 @@ module API
end
end
- class BasicProjectWithAccess < BasicProjectDetails
- expose :permissions do
- expose :project_access, using: Entities::ProjectAccess do |project, options|
- project.project_members.find_by(user_id: options[:user].id)
- end
- end
- end
-
class ProjectWithAccess < Project
expose :permissions do
expose :project_access, using: Entities::ProjectAccess do |project, options|
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 844547665ef..6d2a6f3946c 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -26,7 +26,7 @@ module API
@projects = filter_projects(@projects)
@projects = paginate @projects
if params[:simple]
- present @projects, with: Entities::BasicProjectWithAccess, user: current_user
+ present @projects, with: Entities::BasicProjectDetails, user: current_user
else
present @projects, with: Entities::ProjectWithAccess, user: current_user
end