summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-05 15:00:25 +0100
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-05 15:00:25 +0100
commit0a21731e3bc400ceb9898c9efbc2a186f5348e09 (patch)
tree425b9c0f88633f3d69400d77667284b42d3ba663 /lib/api
parentf60bceb988bd629f9adecc070ef5579d264f27c6 (diff)
downloadgitlab-ce-0a21731e3bc400ceb9898c9efbc2a186f5348e09.tar.gz
Add ci fields in project create/update feature API
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/helpers.rb2
-rw-r--r--lib/api/projects.rb15
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index a4df810e755..563c12e4f74 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -157,7 +157,7 @@ module API
def attributes_for_keys(keys, custom_params = nil)
attrs = {}
keys.each do |key|
- if params[key].present? or (params.has_key?(key) and params[key] == false)
+ if params[key].present? or (params.has_key?(key) and (params[key].empty? or params[key] == false))
attrs[key] = params[key]
end
end
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 0781236cf6d..7dd6b133f9b 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -114,7 +114,10 @@ module API
:namespace_id,
:public,
:visibility_level,
- :import_url]
+ :import_url,
+ :build_allow_git_fetch,
+ :build_timeout,
+ :build_coverage_regex]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(current_user, attrs).execute
if @project.saved?
@@ -159,7 +162,10 @@ module API
:shared_runners_enabled,
:public,
:visibility_level,
- :import_url]
+ :import_url,
+ :build_allow_git_fetch,
+ :build_timeout,
+ :build_coverage_regex]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(user, attrs).execute
if @project.saved?
@@ -215,7 +221,10 @@ module API
:snippets_enabled,
:shared_runners_enabled,
:public,
- :visibility_level]
+ :visibility_level,
+ :build_allow_git_fetch,
+ :build_timeout,
+ :build_coverage_regex]
attrs = map_public_to_visibility_level(attrs)
authorize_admin_project
authorize! :rename_project, user_project if attrs[:name].present?