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
7e6fd78f
Commit
7e6fd78f
authored
Apr 03, 2022
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix links not opening in a new tab
- Update page title tag and class. - Fix ESLint issues.
parent
f20bdc7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/javascripts/integrations/edit/components/integration_form.vue
...scripts/integrations/edit/components/integration_form.vue
+4
-1
app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue
...ripts/integrations/edit/components/jira_issues_fields.vue
+1
-3
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+1
-1
app/views/shared/integrations/edit.html.haml
app/views/shared/integrations/edit.html.haml
+1
-1
No files found.
app/assets/javascripts/integrations/edit/components/integration_form.vue
View file @
7e6fd78f
...
...
@@ -167,6 +167,9 @@ export default {
this
.
integrationActive
=
integrationActive
;
},
},
descriptionHtmlConfig
:
{
ADD_ATTR
:
[
'
target
'
],
// allow external links, can be removed after https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1427 is implemented
},
helpHtmlConfig
:
{
ADD_ATTR
:
[
'
target
'
],
// allow external links, can be removed after https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1427 is implemented
ADD_TAGS
:
[
'
use
'
],
// to support icon SVGs
...
...
@@ -212,7 +215,7 @@ export default {
<div
class=
"row"
>
<div
class=
"col-lg-4"
>
<h4
class=
"gl-mt-0"
>
{{
section
.
title
}}
</h4>
<p
v-safe-html=
"section.description"
></p>
<p
v-safe-html
:
[$
options.descriptionHtmlConfig]
=
"section.description"
></p>
</div>
<div
class=
"col-lg-8"
>
...
...
app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue
View file @
7e6fd78f
<
script
>
import
{
GlFormGroup
,
GlFormCheckbox
,
GlFormInput
,
GlSprintf
,
GlLink
}
from
'
@gitlab/ui
'
;
import
{
GlFormGroup
,
GlFormCheckbox
,
GlFormInput
}
from
'
@gitlab/ui
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
JiraUpgradeCta
from
'
./jira_upgrade_cta.vue
'
;
...
...
@@ -10,8 +10,6 @@ export default {
GlFormGroup
,
GlFormCheckbox
,
GlFormInput
,
GlSprintf
,
GlLink
,
JiraUpgradeCta
,
JiraIssueCreationVulnerabilities
:
()
=>
import
(
'
ee_component/integrations/edit/components/jira_issue_creation_vulnerabilities.vue
'
),
...
...
app/views/projects/services/_form.html.haml
View file @
7e6fd78f
...
...
@@ -11,7 +11,7 @@
.gl-alert-body
=
s_
(
'ExternalIssueIntegration|Only one issue tracker integration can be active at a time. Please disable the active tracker first and try again.'
)
%h
3
.page-title
%h
2
.title.gl-mb-4
=
integration
.
title
-
if
integration
.
operating?
=
sprite_icon
(
'check'
,
css_class:
'gl-text-green-500'
)
...
...
app/views/shared/integrations/edit.html.haml
View file @
7e6fd78f
...
...
@@ -3,7 +3,7 @@
-
page_title
@integration
.
title
,
_
(
'Integrations'
)
-
@content_class
=
'limit-container-width'
unless
fluid_layout
%h
3
.page-title
%h
2
.title.gl-mb-4
=
@integration
.
title
=
render
'shared/integrations/tabs'
,
integration:
@integration
,
active_tab:
'edit'
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