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
3d5ceda5
Commit
3d5ceda5
authored
Apr 12, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up UI elements
Add functionality to Unlink button
parent
c202d3c4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
12 deletions
+14
-12
app/assets/javascripts/jira_connect/components/app.vue
app/assets/javascripts/jira_connect/components/app.vue
+3
-7
app/assets/javascripts/jira_connect/components/groups_list_item.vue
.../javascripts/jira_connect/components/groups_list_item.vue
+1
-3
app/assets/javascripts/jira_connect/components/subscriptions_list.vue
...avascripts/jira_connect/components/subscriptions_list.vue
+7
-0
app/assets/javascripts/jira_connect/index.js
app/assets/javascripts/jira_connect/index.js
+2
-2
app/assets/stylesheets/page_bundles/jira_connect.scss
app/assets/stylesheets/page_bundles/jira_connect.scss
+1
-0
No files found.
app/assets/javascripts/jira_connect/components/app.vue
View file @
3d5ceda5
...
...
@@ -92,13 +92,9 @@ export default {
<h2
class=
"gl-text-center"
>
{{ s__('JiraService|GitLab for Jira Configuration') }}
</h2>
<div
class=
"jira-connect-app-body"
>
<div
class=
"gl-display-flex gl-justify-content-space-between gl-my-7 gl-pb-4 gl-border-b-solid gl-border-b-1 gl-border-b-gray-200"
>
<h5
class=
"gl-align-self-center gl-mb-0"
data-testid=
"new-jira-connect-ui-heading"
>
{{ s__('Integrations|Linked namespaces') }}
</h5>
<div
class=
"jira-connect-app-body gl-my-7 gl-pb-4"
>
<div
class=
"gl-display-flex gl-justify-content-space-between"
>
<h5
class=
""
data-testid=
"new-jira-connect-ui-heading"
></h5>
<gl-button
v-if=
"usersPath"
category=
"primary"
...
...
app/assets/javascripts/jira_connect/components/groups_list_item.vue
View file @
3d5ceda5
<
script
>
import
{
Gl
Avatar
,
GlButton
,
GlIc
on
}
from
'
@gitlab/ui
'
;
import
{
Gl
Butt
on
}
from
'
@gitlab/ui
'
;
import
{
helpPagePath
}
from
'
~/helpers/help_page_helper
'
;
import
{
addSubscription
}
from
'
~/jira_connect/api
'
;
import
{
persistAlert
,
reloadPage
}
from
'
~/jira_connect/utils
'
;
...
...
@@ -8,9 +8,7 @@ import GroupItemName from './group_item_name.vue';
export
default
{
components
:
{
GlAvatar
,
GlButton
,
GlIcon
,
GroupItemName
,
},
inject
:
{
...
...
app/assets/javascripts/jira_connect/components/subscriptions_list.vue
View file @
3d5ceda5
<
script
>
import
{
GlButton
,
GlTable
}
from
'
@gitlab/ui
'
;
import
{
removeSubscription
}
from
'
~/jira_connect/api
'
;
import
{
reloadPage
}
from
'
~/jira_connect/utils
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
TimeagoTooltip
from
'
~/vue_shared/components/time_ago_tooltip.vue
'
;
import
GroupItemName
from
'
./group_item_name.vue
'
;
...
...
@@ -33,6 +35,11 @@ export default {
],
methods
:
{
onClick
(
item
)
{
removeSubscription
(
item
.
unlink_path
)
.
then
(()
=>
{
reloadPage
();
})
.
catch
(()
=>
{});
return
item
;
},
},
...
...
app/assets/javascripts/jira_connect/index.js
View file @
3d5ceda5
import
setConfigs
from
'
@gitlab/ui/dist/config
'
;
import
Vue
from
'
vue
'
;
import
{
addSubscription
,
removeSubscription
,
getLocation
}
from
'
~/jira_connect/api
'
;
import
{
reloadPage
,
sizeToParent
}
from
'
~/jira_connect/utils
'
;
import
{
addSubscription
,
removeSubscription
}
from
'
~/jira_connect/api
'
;
import
{
getLocation
,
reloadPage
,
sizeToParent
}
from
'
~/jira_connect/utils
'
;
import
GlFeatureFlagsPlugin
from
'
~/vue_shared/gl_feature_flags_plugin
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
...
...
app/assets/stylesheets/page_bundles/jira_connect.scss
View file @
3d5ceda5
...
...
@@ -15,6 +15,7 @@
@import
'@gitlab/ui/src/components/base/loading_icon/loading_icon'
;
@import
'@gitlab/ui/src/components/base/modal/modal'
;
@import
'@gitlab/ui/src/components/base/pagination/pagination'
;
@import
'@gitlab/ui/src/components/base/table/table'
;
@import
'@gitlab/ui/src/components/base/tooltip/tooltip'
;
@import
'@gitlab/ui/src/components/base/search_box_by_type/search_box_by_type'
;
...
...
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