Commit 60eca5f7 authored by Stan Hu's avatar Stan Hu

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
parents 1b31867e b4359fb2
...@@ -67,9 +67,14 @@ module API ...@@ -67,9 +67,14 @@ module API
pipeline = @project.ensure_pipeline(ref, commit.sha, current_user) pipeline = @project.ensure_pipeline(ref, commit.sha, current_user)
status = GenericCommitStatus.running_or_pending.find_or_initialize_by( status = GenericCommitStatus.running_or_pending.find_or_initialize_by(
project: @project, pipeline: pipeline, project: @project,
user: current_user, name: name, ref: ref) pipeline: pipeline,
status.attributes = declared(params).slice(:target_url, :description) user: current_user,
name: name,
ref: ref,
target_url: params[:target_url],
description: params[:description]
)
begin begin
case params[:state].to_s case params[:state].to_s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment