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
3f2eaaa2
Commit
3f2eaaa2
authored
Jan 01, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retain original casing for build name in manual pipeline dropdown
parent
4b43126d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
+10
-6
app/serializers/build_action_entity.rb
app/serializers/build_action_entity.rb
+1
-1
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
changelogs/unreleased/25946-manual-pipeline-dropdown-casing.yml
...logs/unreleased/25946-manual-pipeline-dropdown-casing.yml
+4
-0
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+2
-2
spec/serializers/build_action_entity_spec.rb
spec/serializers/build_action_entity_spec.rb
+2
-2
No files found.
app/serializers/build_action_entity.rb
View file @
3f2eaaa2
...
@@ -2,7 +2,7 @@ class BuildActionEntity < Grape::Entity
...
@@ -2,7 +2,7 @@ class BuildActionEntity < Grape::Entity
include
RequestAwareEntity
include
RequestAwareEntity
expose
:name
do
|
build
|
expose
:name
do
|
build
|
build
.
name
.
humanize
build
.
name
end
end
expose
:path
do
|
build
|
expose
:path
do
|
build
|
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
3f2eaaa2
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
%li
%li
=
link_to
play_namespace_project_build_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
build
),
method: :post
,
rel:
'nofollow'
do
=
link_to
play_namespace_project_build_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
build
),
method: :post
,
rel:
'nofollow'
do
=
custom_icon
(
'icon_play'
)
=
custom_icon
(
'icon_play'
)
%span
=
build
.
name
.
humanize
%span
=
build
.
name
-
if
artifacts
.
present?
-
if
artifacts
.
present?
.btn-group
.btn-group
%button
.dropdown-toggle.btn.btn-default.build-artifacts.js-pipeline-dropdown-download
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle.btn.btn-default.build-artifacts.js-pipeline-dropdown-download
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
...
...
changelogs/unreleased/25946-manual-pipeline-dropdown-casing.yml
0 → 100644
View file @
3f2eaaa2
---
title
:
Use original casing for build action text
merge_request
:
8387
author
:
spec/features/projects/pipelines/pipelines_spec.rb
View file @
3f2eaaa2
...
@@ -128,13 +128,13 @@ describe 'Pipelines', :feature, :js do
...
@@ -128,13 +128,13 @@ describe 'Pipelines', :feature, :js do
it
'has link to the manual action'
do
it
'has link to the manual action'
do
find
(
'.js-pipeline-dropdown-manual-actions'
).
click
find
(
'.js-pipeline-dropdown-manual-actions'
).
click
expect
(
page
).
to
have_link
(
'
M
anual build'
)
expect
(
page
).
to
have_link
(
'
m
anual build'
)
end
end
context
'when manual action was played'
do
context
'when manual action was played'
do
before
do
before
do
find
(
'.js-pipeline-dropdown-manual-actions'
).
click
find
(
'.js-pipeline-dropdown-manual-actions'
).
click
click_link
(
'
M
anual build'
)
click_link
(
'
m
anual build'
)
end
end
it
'enqueues manual action job'
do
it
'enqueues manual action job'
do
...
...
spec/serializers/build_action_entity_spec.rb
View file @
3f2eaaa2
...
@@ -10,8 +10,8 @@ describe BuildActionEntity do
...
@@ -10,8 +10,8 @@ describe BuildActionEntity do
describe
'#as_json'
do
describe
'#as_json'
do
subject
{
entity
.
as_json
}
subject
{
entity
.
as_json
}
it
'contains
humanized
build name'
do
it
'contains
original
build name'
do
expect
(
subject
[
:name
]).
to
eq
'
Test
build'
expect
(
subject
[
:name
]).
to
eq
'
test_
build'
end
end
it
'contains path to the action play'
do
it
'contains path to the action play'
do
...
...
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