summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-07-06 07:20:36 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-07-06 07:20:36 +0000
commit6afe25ef336aca40b87cede499f8b8f5928129f6 (patch)
tree493201a50520e6b9c1f6f861aaeb8859a4b6f19f /lib/api
parent6c15905c3bd11209858eac8870ffa9211f08f157 (diff)
parentcca9242085d73dff66a946af8a740a4f7419f84c (diff)
downloadgitlab-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')
-rw-r--r--lib/api/entities.rb1
-rw-r--r--lib/api/projects.rb1
2 files changed, 2 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
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index d0bd64b2972..35733ac7711 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -10,6 +10,7 @@ module API
helpers do
params :optional_params_ce do
optional :description, type: String, desc: 'The description of the project'
+ optional :ci_config_path, type: String, desc: 'The path to CI config file. Defaults to `.gitlab-ci.yml`'
optional :issues_enabled, type: Boolean, desc: 'Flag indication if the issue tracker is enabled'
optional :merge_requests_enabled, type: Boolean, desc: 'Flag indication if merge requests are enabled'
optional :wiki_enabled, type: Boolean, desc: 'Flag indication if the wiki is enabled'