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
c3292e65
Commit
c3292e65
authored
Apr 05, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
f67419d3
8e33e7cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
app/views/projects/pipelines/new.html.haml
app/views/projects/pipelines/new.html.haml
+2
-2
changelogs/unreleased/58835-button-run-pipeline.yml
changelogs/unreleased/58835-button-run-pipeline.yml
+5
-0
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+6
-6
No files found.
app/views/projects/pipelines/new.html.haml
View file @
c3292e65
...
...
@@ -10,7 +10,7 @@
=
form_errors
(
@pipeline
)
.form-group.row
.col-sm-12
=
f
.
label
:ref
,
s_
(
'Pipeline|
Create
for'
),
class:
'col-form-label'
=
f
.
label
:ref
,
s_
(
'Pipeline|
Run
for'
),
class:
'col-form-label'
=
hidden_field_tag
'pipeline[ref]'
,
params
[
:ref
]
||
@project
.
default_branch
=
dropdown_tag
(
params
[
:ref
]
||
@project
.
default_branch
,
options:
{
toggle_class:
'js-branch-select wide monospace'
,
...
...
@@ -28,7 +28,7 @@
=
(
s_
(
"Pipeline|Specify variable values to be used in this run. The values specified in %{settings_link} will be used by default."
)
%
{
settings_link:
settings_link
}).
html_safe
.form-actions
=
f
.
submit
s_
(
'Pipeline|
Create p
ipeline'
),
class:
'btn btn-success js-variables-save-button'
,
tabindex:
3
=
f
.
submit
s_
(
'Pipeline|
Run P
ipeline'
),
class:
'btn btn-success js-variables-save-button'
,
tabindex:
3
=
link_to
_
(
'Cancel'
),
project_pipelines_path
(
@project
),
class:
'btn btn-default float-right'
-# haml-lint:disable InlineJavaScript
...
...
changelogs/unreleased/58835-button-run-pipeline.yml
0 → 100644
View file @
c3292e65
---
title
:
Changed button label at /pipelines/new
merge_request
:
26893
author
:
antfobe,leonardofl
type
:
other
spec/features/projects/pipelines/pipelines_spec.rb
View file @
c3292e65
...
...
@@ -685,7 +685,7 @@ describe 'Pipelines', :js do
end
it
'creates a new pipeline'
do
expect
{
click_on
'
Create p
ipeline'
}
expect
{
click_on
'
Run P
ipeline'
}
.
to
change
{
Ci
::
Pipeline
.
count
}.
by
(
1
)
expect
(
Ci
::
Pipeline
.
last
).
to
be_web
...
...
@@ -698,7 +698,7 @@ describe 'Pipelines', :js do
fill_in
"Input variable value"
,
with:
"value"
end
expect
{
click_on
'
Create p
ipeline'
}
expect
{
click_on
'
Run P
ipeline'
}
.
to
change
{
Ci
::
Pipeline
.
count
}.
by
(
1
)
expect
(
Ci
::
Pipeline
.
last
.
variables
.
map
{
|
var
|
var
.
slice
(
:key
,
:secret_value
)
})
...
...
@@ -709,7 +709,7 @@ describe 'Pipelines', :js do
context
'without gitlab-ci.yml'
do
before
do
click_on
'
Create p
ipeline'
click_on
'
Run P
ipeline'
end
it
{
expect
(
page
).
to
have_content
(
'Missing .gitlab-ci.yml file'
)
}
...
...
@@ -722,14 +722,14 @@ describe 'Pipelines', :js do
click_link
'master'
end
expect
{
click_on
'
Create p
ipeline'
}
expect
{
click_on
'
Run P
ipeline'
}
.
to
change
{
Ci
::
Pipeline
.
count
}.
by
(
1
)
end
end
end
end
describe
'
Create p
ipelines'
do
describe
'
Run P
ipelines'
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
before
do
...
...
@@ -740,7 +740,7 @@ describe 'Pipelines', :js do
it
'has field to add a new pipeline'
do
expect
(
page
).
to
have_selector
(
'.js-branch-select'
)
expect
(
find
(
'.js-branch-select'
)).
to
have_content
project
.
default_branch
expect
(
page
).
to
have_content
(
'
Create
for'
)
expect
(
page
).
to
have_content
(
'
Run
for'
)
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