summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-07-05 20:11:01 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-07-05 20:11:01 +0800
commit9f5ac179d1ca4819006c66ae385ba7153f6c7e4f (patch)
tree8dafab8a2f87092dd57c26fbbb70b131d98d9078 /lib
parent9f7e5e45df9b7d99b97e40d1c08250925a408875 (diff)
downloadgitlab-ce-9f5ac179d1ca4819006c66ae385ba7153f6c7e4f.tar.gz
Rename ci_config_file to ci_config_path
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
-rw-r--r--lib/api/projects.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 4ab264a3b98..78d2e6de44e 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -112,7 +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_file
+ 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 efd133d81b3..35733ac7711 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -10,7 +10,7 @@ module API
helpers do
params :optional_params_ce do
optional :description, type: String, desc: 'The description of the project'
- optional :ci_config_file, type: String, desc: 'The path to CI config file. Defaults to `.gitlab-ci.yml`'
+ 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'