summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-06-12 11:02:36 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-06-12 11:02:36 +0000
commit991976642f180fbc855ebb27b03cbe0c9217f7a5 (patch)
tree6c10bd81a9b3ef4baec560b69849202709170a43 /lib/api/entities.rb
parent06e89d786c4ac67d9262c576b9aadb7d40dee9c2 (diff)
parent3ac527b4889b9465b2d55ca0c9317a3e8479a625 (diff)
downloadgitlab-ce-991976642f180fbc855ebb27b03cbe0c9217f7a5.tar.gz
Merge branch 'expose-project-git-depth-via-api' into 'master'
Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 880b07d0a84..8840accf675 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -265,6 +265,7 @@ module API
expose :open_issues_count, if: lambda { |project, options| project.feature_available?(:issues, options[:current_user]) }
expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
+ expose :ci_default_git_depth
expose :public_builds, as: :public_jobs
expose :ci_config_path, if: -> (project, options) { Ability.allowed?(options[:current_user], :download_code, project) }
expose :shared_with_groups do |project, options|
@@ -287,6 +288,7 @@ module API
# N+1 is solved then by using `subject.tags.map(&:name)`
# MR describing the solution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20555
super(projects_relation).preload(:group)
+ .preload(:ci_cd_settings)
.preload(project_group_links: { group: :route },
fork_network: :root_project,
fork_network_member: :forked_from_project,