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
dfdd9cbc
Commit
dfdd9cbc
authored
Dec 11, 2020
by
Tom Quirk
Committed by
Andrew Fontaine
Dec 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address reviewer feedback
- remove surrounding quotes from `title` attribute
parent
3fd38e1e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
9 deletions
+13
-9
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+2
-2
app/views/shared/integrations/_index.html.haml
app/views/shared/integrations/_index.html.haml
+3
-4
changelogs/unreleased/integrations-page-cleanup.yml
changelogs/unreleased/integrations-page-cleanup.yml
+5
-0
qa/qa/ee/page/project/settings/integrations.rb
qa/qa/ee/page/project/settings/integrations.rb
+1
-1
qa/qa/page/project/settings/integrations.rb
qa/qa/page/project/settings/integrations.rb
+2
-2
No files found.
app/helpers/icons_helper.rb
View file @
dfdd9cbc
...
...
@@ -96,9 +96,9 @@ module IconsHelper
def
boolean_to_icon
(
value
)
if
value
sprite_icon
(
'check'
,
css_class:
'
cgreen
'
)
sprite_icon
(
'check'
,
css_class:
'
gl-text-green-500
'
)
else
sprite_icon
(
'power'
,
css_class:
'
clgray
'
)
sprite_icon
(
'power'
,
css_class:
'
gl-text-gray-500
'
)
end
end
...
...
app/views/shared/integrations/_index.html.haml
View file @
dfdd9cbc
%table
.table.b-table.gl-table
.mt-3
{
role:
'table'
,
'aria-busy'
:
false
,
'aria-colcount'
:
4
}
%table
.table.b-table.gl-table
{
role:
'table'
,
'aria-busy'
:
false
,
'aria-colcount'
:
4
}
%colgroup
%col
%col
...
...
@@ -15,11 +15,10 @@
-
integrations
.
each
do
|
integration
|
-
activated_label
=
(
integration
.
activated?
?
s_
(
"ProjectService|%{service_title}: status on"
)
:
s_
(
"ProjectService|%{service_title}: status off"
))
%
{
service_title:
integration
.
title
}
%tr
{
role:
'row'
}
%td
{
role:
'cell'
,
'aria-colindex'
:
1
,
'aria-label'
:
activated_label
}
%td
{
role:
'cell'
,
'aria-colindex'
:
1
,
'aria-label'
:
activated_label
,
title:
activated_label
}
=
boolean_to_icon
integration
.
operating?
%td
{
role:
'cell'
,
'aria-colindex'
:
2
}
=
link_to
scoped_edit_integration_path
(
integration
),
{
data:
{
qa_selector:
"
#{
integration
.
to_param
}
_link"
}
}
do
%strong
=
integration
.
title
=
link_to
integration
.
title
,
scoped_edit_integration_path
(
integration
),
class:
'gl-font-weight-bold'
,
data:
{
qa_selector:
"
#{
integration
.
to_param
}
_link"
}
%td
.d-none.d-sm-table-cell
{
role:
'cell'
,
'aria-colindex'
:
3
}
=
integration
.
description
%td
{
role:
'cell'
,
'aria-colindex'
:
4
}
...
...
changelogs/unreleased/integrations-page-cleanup.yml
0 → 100644
View file @
dfdd9cbc
---
title
:
Use GitLab UI styles on Integrations page
merge_request
:
47478
author
:
type
:
changed
qa/qa/ee/page/project/settings/integrations.rb
View file @
dfdd9cbc
...
...
@@ -11,7 +11,7 @@ module QA
def
self
.
prepended
(
base
)
base
.
class_eval
do
view
'app/views/shared/integrations/_index.html.haml'
do
element
:jenkins_link
,
'
{
data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
element
:jenkins_link
,
'data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
end
end
end
...
...
qa/qa/page/project/settings/integrations.rb
View file @
dfdd9cbc
...
...
@@ -6,8 +6,8 @@ module QA
module
Settings
class
Integrations
<
QA
::
Page
::
Base
view
'app/views/shared/integrations/_index.html.haml'
do
element
:prometheus_link
,
'
{
data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
element
:jira_link
,
'
{
data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
element
:prometheus_link
,
'data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
element
:jira_link
,
'data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
end
def
click_on_prometheus_integration
...
...
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