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
7e486816
Commit
7e486816
authored
Apr 14, 2022
by
Jeremy Elder
Committed by
Olena Horal-Koretska
Apr 14, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Audit and update buttons on Projects::PipelinesController#show"
parent
1ad3a6c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
11 deletions
+5
-11
app/assets/javascripts/pipelines/components/header_component.vue
...ets/javascripts/pipelines/components/header_component.vue
+1
-3
app/assets/javascripts/vue_shared/components/header_ci_component.vue
...javascripts/vue_shared/components/header_ci_component.vue
+2
-6
app/helpers/button_helper.rb
app/helpers/button_helper.rb
+1
-1
spec/helpers/button_helper_spec.rb
spec/helpers/button_helper_spec.rb
+1
-1
No files found.
app/assets/javascripts/pipelines/components/header_component.vue
View file @
7e486816
...
@@ -249,8 +249,7 @@ export default {
...
@@ -249,8 +249,7 @@ export default {
:title=
"$options.BUTTON_TOOLTIP_RETRY"
:title=
"$options.BUTTON_TOOLTIP_RETRY"
:loading=
"isRetrying"
:loading=
"isRetrying"
:disabled=
"isRetrying"
:disabled=
"isRetrying"
category=
"secondary"
variant=
"confirm"
variant=
"info"
data-testid=
"retryPipeline"
data-testid=
"retryPipeline"
class=
"js-retry-button"
class=
"js-retry-button"
@
click=
"retryPipeline()"
@
click=
"retryPipeline()"
...
@@ -262,7 +261,6 @@ export default {
...
@@ -262,7 +261,6 @@ export default {
v-if=
"canCancelPipeline"
v-if=
"canCancelPipeline"
:loading=
"isCanceling"
:loading=
"isCanceling"
:disabled=
"isCanceling"
:disabled=
"isCanceling"
class=
"gl-ml-3"
variant=
"danger"
variant=
"danger"
data-testid=
"cancelPipeline"
data-testid=
"cancelPipeline"
@
click=
"cancelPipeline()"
@
click=
"cancelPipeline()"
...
...
app/assets/javascripts/vue_shared/components/header_ci_component.vue
View file @
7e486816
...
@@ -117,7 +117,7 @@ export default {
...
@@ -117,7 +117,7 @@ export default {
<
template
>
<
template
>
<header
<header
class=
"page-content-header gl-display-flex gl-min-h-7"
class=
"page-content-header gl-
md-
display-flex gl-min-h-7"
data-qa-selector=
"pipeline_header"
data-qa-selector=
"pipeline_header"
data-testid=
"ci-header-content"
data-testid=
"ci-header-content"
>
>
...
@@ -163,11 +163,7 @@ export default {
...
@@ -163,11 +163,7 @@ export default {
</
template
>
</
template
>
</section>
</section>
<section
<section
v-if=
"$slots.default"
data-testid=
"ci-header-action-buttons"
class=
"gl-display-flex"
>
v-if=
"$slots.default"
data-testid=
"ci-header-action-buttons"
class=
"gl-display-flex gl-mr-3"
>
<slot></slot>
<slot></slot>
</section>
</section>
<gl-button
<gl-button
...
...
app/helpers/button_helper.rb
View file @
7e486816
...
@@ -20,7 +20,7 @@ module ButtonHelper
...
@@ -20,7 +20,7 @@ module ButtonHelper
#
#
# See http://clipboardjs.com/#usage
# See http://clipboardjs.com/#usage
def
clipboard_button
(
data
=
{})
def
clipboard_button
(
data
=
{})
css_class
=
data
[
:class
]
||
'btn-clipboard
btn-transparent
'
css_class
=
data
[
:class
]
||
'btn-clipboard
gl-button btn-default-tertiary btn-icon btn-sm
'
title
=
data
[
:title
]
||
_
(
'Copy'
)
title
=
data
[
:title
]
||
_
(
'Copy'
)
button_text
=
data
[
:button_text
]
||
nil
button_text
=
data
[
:button_text
]
||
nil
hide_tooltip
=
data
[
:hide_tooltip
]
||
false
hide_tooltip
=
data
[
:hide_tooltip
]
||
false
...
...
spec/helpers/button_helper_spec.rb
View file @
7e486816
...
@@ -164,7 +164,7 @@ RSpec.describe ButtonHelper do
...
@@ -164,7 +164,7 @@ RSpec.describe ButtonHelper do
context
'with default options'
do
context
'with default options'
do
context
'when no `text` attribute is not provided'
do
context
'when no `text` attribute is not provided'
do
it
'shows copy to clipboard button with default configuration and no text set to copy'
do
it
'shows copy to clipboard button with default configuration and no text set to copy'
do
expect
(
element
.
attr
(
'class'
)).
to
eq
(
'btn btn-clipboard
btn-transparent
'
)
expect
(
element
.
attr
(
'class'
)).
to
eq
(
'btn btn-clipboard
gl-button btn-default-tertiary btn-icon btn-sm
'
)
expect
(
element
.
attr
(
'type'
)).
to
eq
(
'button'
)
expect
(
element
.
attr
(
'type'
)).
to
eq
(
'button'
)
expect
(
element
.
attr
(
'aria-label'
)).
to
eq
(
'Copy'
)
expect
(
element
.
attr
(
'aria-label'
)).
to
eq
(
'Copy'
)
expect
(
element
.
attr
(
'aria-live'
)).
to
eq
(
'polite'
)
expect
(
element
.
attr
(
'aria-live'
)).
to
eq
(
'polite'
)
...
...
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