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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c8e6ea01
Commit
c8e6ea01
authored
Nov 10, 2021
by
Pedro Pombeiro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove left-over project argument
parent
366d16cd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
app/presenters/ci/build_runner_presenter.rb
app/presenters/ci/build_runner_presenter.rb
+1
-1
lib/gitlab/ci/pipeline/seed/build.rb
lib/gitlab/ci/pipeline/seed/build.rb
+1
-1
lib/gitlab/ci/variables/collection.rb
lib/gitlab/ci/variables/collection.rb
+1
-1
spec/lib/gitlab/ci/variables/collection_spec.rb
spec/lib/gitlab/ci/variables/collection_spec.rb
+1
-3
No files found.
app/presenters/ci/build_runner_presenter.rb
View file @
c8e6ea01
...
@@ -33,7 +33,7 @@ module Ci
...
@@ -33,7 +33,7 @@ module Ci
end
end
def
runner_variables
def
runner_variables
variables
.
sort_and_expand_all
(
project
,
keep_undefined:
true
).
to_runner_variables
variables
.
sort_and_expand_all
(
keep_undefined:
true
).
to_runner_variables
end
end
def
refspecs
def
refspecs
...
...
lib/gitlab/ci/pipeline/seed/build.rb
View file @
c8e6ea01
...
@@ -173,7 +173,7 @@ module Gitlab
...
@@ -173,7 +173,7 @@ module Gitlab
end
end
def
variable_expansion_errors
def
variable_expansion_errors
expanded_collection
=
evaluate_context
.
variables
.
sort_and_expand_all
(
@pipeline
.
project
)
expanded_collection
=
evaluate_context
.
variables
.
sort_and_expand_all
errors
=
expanded_collection
.
errors
errors
=
expanded_collection
.
errors
[
"
#{
name
}
:
#{
errors
}
"
]
if
errors
[
"
#{
name
}
:
#{
errors
}
"
]
if
errors
end
end
...
...
lib/gitlab/ci/variables/collection.rb
View file @
c8e6ea01
...
@@ -89,7 +89,7 @@ module Gitlab
...
@@ -89,7 +89,7 @@ module Gitlab
end
end
end
end
def
sort_and_expand_all
(
project
,
keep_undefined:
false
)
def
sort_and_expand_all
(
keep_undefined:
false
)
sorted
=
Sort
.
new
(
self
)
sorted
=
Sort
.
new
(
self
)
return
self
.
class
.
new
(
self
,
sorted
.
errors
)
unless
sorted
.
valid?
return
self
.
class
.
new
(
self
,
sorted
.
errors
)
unless
sorted
.
valid?
...
...
spec/lib/gitlab/ci/variables/collection_spec.rb
View file @
c8e6ea01
...
@@ -358,8 +358,6 @@ RSpec.describe Gitlab::Ci::Variables::Collection do
...
@@ -358,8 +358,6 @@ RSpec.describe Gitlab::Ci::Variables::Collection do
end
end
describe
'#sort_and_expand_all'
do
describe
'#sort_and_expand_all'
do
let_it_be
(
:project
)
{
create
(
:project
)
}
context
'table tests'
do
context
'table tests'
do
using
RSpec
::
Parameterized
::
TableSyntax
using
RSpec
::
Parameterized
::
TableSyntax
...
@@ -550,7 +548,7 @@ RSpec.describe Gitlab::Ci::Variables::Collection do
...
@@ -550,7 +548,7 @@ RSpec.describe Gitlab::Ci::Variables::Collection do
with_them
do
with_them
do
let
(
:collection
)
{
Gitlab
::
Ci
::
Variables
::
Collection
.
new
(
variables
)
}
let
(
:collection
)
{
Gitlab
::
Ci
::
Variables
::
Collection
.
new
(
variables
)
}
subject
{
collection
.
sort_and_expand_all
(
project
,
keep_undefined:
keep_undefined
)
}
subject
{
collection
.
sort_and_expand_all
(
keep_undefined:
keep_undefined
)
}
it
'returns Collection'
do
it
'returns Collection'
do
is_expected
.
to
be_an_instance_of
(
Gitlab
::
Ci
::
Variables
::
Collection
)
is_expected
.
to
be_an_instance_of
(
Gitlab
::
Ci
::
Variables
::
Collection
)
...
...
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