Merge branch 'fix-ruby-2-1-failures' into 'master'

Don't use Hash#slice since it's not supported in Ruby 2.1

There is currently a build failure in `master` and this MR fixes it. The issue was introduced by !6879.

The problem is that `Hash#slice` doesn't exists in Ruby 2.1. I've created an issue to take care of the other places we're using `Hash#slice`: #23590

See merge request !7025
This commit is contained in:
Stan Hu 2016-10-20 18:47:27 +00:00
commit 60eca5f7b5
1 changed files with 8 additions and 3 deletions

View File

@ -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