Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
55e488d6
Commit
55e488d6
authored
Feb 12, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
b753fc6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+7
-2
No files found.
app/services/ci/create_pipeline_service.rb
View file @
55e488d6
...
@@ -36,7 +36,7 @@ module Ci
...
@@ -36,7 +36,7 @@ module Ci
project:
project
,
project:
project
,
current_user:
current_user
,
current_user:
current_user
,
push_options:
params
[
:push_options
],
push_options:
params
[
:push_options
],
**
extra_options
(
**
options
))
**
extra_options
(
options
))
sequence
=
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Sequence
sequence
=
Gitlab
::
Ci
::
Pipeline
::
Chain
::
Sequence
.
new
(
pipeline
,
command
,
SEQUENCE
)
.
new
(
pipeline
,
command
,
SEQUENCE
)
...
@@ -108,7 +108,12 @@ module Ci
...
@@ -108,7 +108,12 @@ module Ci
end
end
# rubocop: enable CodeReuse/ActiveRecord
# rubocop: enable CodeReuse/ActiveRecord
def
extra_options
def
extra_options
(
options
=
{})
# In Ruby 2.4, even when options is empty, f(**options) doesn't work when f
# doesn't have any parameters. We reproduce the Ruby 2.5 behavior by
# checking explicitely that no arguments are given.
raise
ArgumentError
if
options
.
any?
{}
# overriden in EE
{}
# overriden in EE
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment