diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-07-06 07:20:36 +0000 |
| commit | 6afe25ef336aca40b87cede499f8b8f5928129f6 (patch) | |
| tree | 493201a50520e6b9c1f6f861aaeb8859a4b6f19f /lib/api/entities.rb | |
| parent | 6c15905c3bd11209858eac8870ffa9211f08f157 (diff) | |
| parent | cca9242085d73dff66a946af8a740a4f7419f84c (diff) | |
| download | gitlab-ce-6afe25ef336aca40b87cede499f8b8f5928129f6.tar.gz | |
Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
Resolve "Project option to allow customizing CI/CD config path"
Closes #32815 and #33130
See merge request !12509
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 9cd078a2356..e9bad721f44 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -112,6 +112,7 @@ module API expose :open_issues_count, if: lambda { |project, options| project.feature_available?(:issues, options[:current_user]) && project.default_issues_tracker? } expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] } expose :public_builds, as: :public_jobs + expose :ci_config_path expose :shared_with_groups do |project, options| SharedGroup.represent(project.project_group_links.all, options) end |