summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-11 13:38:37 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-11 13:38:37 +0200
commit2ed2ef921026cbde5dddda89177bfa50e2993ecd (patch)
treea320046ab80fb624d585a6d903a0a1d61dbd4dd3 /lib
parent187face620cfa0d5617a1c49e28dfbb20134fe41 (diff)
downloadgitlab-ce-2ed2ef921026cbde5dddda89177bfa50e2993ecd.tar.gz
Remove network from CI
Diffstat (limited to 'lib')
-rw-r--r--lib/api/services.rb4
-rw-r--r--lib/ci/api/projects.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 73645cedea4..6d2322bb464 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -20,7 +20,7 @@ module API
end
required_attributes! validators.map(&:attributes).flatten.uniq
- attrs = attributes_for_keys service_attributes
+ attrs = attributes_for_keys service_attributes
if project_service.update_attributes(attrs.merge(active: true))
true
@@ -41,7 +41,7 @@ module API
attrs = service_attributes.inject({}) do |hash, key|
hash.merge!(key => nil)
end
-
+
if project_service.update_attributes(attrs.merge(active: false))
true
else
diff --git a/lib/ci/api/projects.rb b/lib/ci/api/projects.rb
index bdcacecf6ab..556de3bff9f 100644
--- a/lib/ci/api/projects.rb
+++ b/lib/ci/api/projects.rb
@@ -18,7 +18,7 @@ module Ci
project = Ci::Project.find(params[:project_id])
unauthorized! unless current_user.can_manage_project?(project.gitlab_id)
-
+
web_hook = project.web_hooks.new({ url: params[:web_hook] })
if web_hook.save