summaryrefslogtreecommitdiff
path: root/lib/api/commit_statuses.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
committerPhil Hughes <me@iamphill.com>2016-10-26 08:47:09 +0100
commita2eff1a8e55b4bf513d3d752fcd6477595813dc2 (patch)
treee7d5e3e097ef85b871c7ab5b4673e6903c294144 /lib/api/commit_statuses.rb
parent13f170fc5d182da78c3d0a7a0885628f59420ea0 (diff)
parent3d174c7198f103cdedd7c7ffb7678aff1dd4de33 (diff)
downloadgitlab-ce-issue-board-sidebar.tar.gz
Merge branch 'master' into issue-board-sidebarissue-board-sidebar
Diffstat (limited to 'lib/api/commit_statuses.rb')
-rw-r--r--lib/api/commit_statuses.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index f282a3b9cd6..f54d4f06627 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -67,9 +67,14 @@ module API
pipeline = @project.ensure_pipeline(ref, commit.sha, current_user)
status = GenericCommitStatus.running_or_pending.find_or_initialize_by(
- project: @project, pipeline: pipeline,
- user: current_user, name: name, ref: ref)
- status.attributes = declared(params).slice(:target_url, :description)
+ project: @project,
+ pipeline: pipeline,
+ user: current_user,
+ name: name,
+ ref: ref,
+ target_url: params[:target_url],
+ description: params[:description]
+ )
begin
case params[:state].to_s