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
0830fec4
Commit
0830fec4
authored
May 05, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename integrations collection partial
Remove rednundant utility class
parent
08debbbe
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
11 deletions
+5
-11
app/assets/stylesheets/utilities.scss
app/assets/stylesheets/utilities.scss
+0
-6
app/views/admin/application_settings/integrations.html.haml
app/views/admin/application_settings/integrations.html.haml
+1
-1
app/views/groups/settings/integrations/index.html.haml
app/views/groups/settings/integrations/index.html.haml
+1
-1
app/views/projects/settings/integrations/show.html.haml
app/views/projects/settings/integrations/show.html.haml
+2
-2
app/views/shared/integrations/_index.html.haml
app/views/shared/integrations/_index.html.haml
+0
-0
qa/qa/ee/page/project/settings/integrations.rb
qa/qa/ee/page/project/settings/integrations.rb
+1
-1
No files found.
app/assets/stylesheets/utilities.scss
View file @
0830fec4
...
...
@@ -137,12 +137,6 @@
}
}
.d-sm-table-cell
{
@include
media-breakpoint-up
(
sm
)
{
display
:
table-cell
!
important
;
}
}
.gl-white-space-normal
{
@include
gl-white-space-normal
;
}
.gl-word-break-all
{
@include
gl-word-break-all
;
}
.gl-reset-line-height
{
@include
gl-reset-line-height
;
}
...
...
app/views/admin/application_settings/integrations.html.haml
View file @
0830fec4
...
...
@@ -18,7 +18,7 @@
%p
=
s_
(
'AdminSettings|Integrations configured here will automatically apply to all projects on this instance.'
)
=
link_to
_
(
'Learn more'
),
'#'
=
render
'shared/integrations/in
tegrations
'
,
integrations:
@integrations
=
render
'shared/integrations/in
dex
'
,
integrations:
@integrations
-
else
=
render_if_exists
'admin/application_settings/elasticsearch_form'
...
...
app/views/groups/settings/integrations/index.html.haml
View file @
0830fec4
...
...
@@ -6,4 +6,4 @@
%p
=
s_
(
'GroupSettings|Integrations configured here will automatically apply to all projects in this group.'
)
=
link_to
_
(
'Learn more'
),
'#'
=
render
'shared/integrations/in
tegrations
'
,
integrations:
@integrations
=
render
'shared/integrations/in
dex
'
,
integrations:
@integrations
app/views/projects/settings/integrations/show.html.haml
View file @
0830fec4
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
breadcrumb_title
_
(
'Integration Settings'
)
-
page_title
_
(
'Integrations'
)
-
@content_class
=
'limit-container-width'
unless
fluid_layout
-
if
show_webhooks_moved_alert?
.gl-alert.gl-alert-info.js-webhooks-moved-alert.prepend-top-default
{
role:
'alert'
,
data:
{
feature_id:
UserCalloutsHelper
::
WEBHOOKS_MOVED
,
dismiss_endpoint:
user_callouts_path
}
}
...
...
@@ -14,4 +14,4 @@
%h4
=
s_
(
'Integrations'
)
%p
=
s_
(
'Integrations allow you to integrate GitLab with other applications'
)
=
render
'shared/integrations/in
tegrations
'
,
integrations:
@services
=
render
'shared/integrations/in
dex
'
,
integrations:
@services
app/views/shared/integrations/_in
tegrations
.html.haml
→
app/views/shared/integrations/_in
dex
.html.haml
View file @
0830fec4
File moved
qa/qa/ee/page/project/settings/integrations.rb
View file @
0830fec4
...
...
@@ -6,7 +6,7 @@ module QA
module
Project
module
Settings
class
Integrations
<
QA
::
Page
::
Base
view
'app/views/shared/integrations/_in
tegrations
.html.haml'
do
view
'app/views/shared/integrations/_in
dex
.html.haml'
do
element
:jenkins_link
,
'{ data: { qa_selector: "#{integration.to_param'
# rubocop:disable QA/ElementWithPattern
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