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
a56a02ee
Commit
a56a02ee
authored
Oct 14, 2020
by
pburdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add delete subscriptions
Add the ability to delete pipeline subscriptions from the UI.
parent
5cf068a4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
4 deletions
+31
-4
ee/app/views/projects/settings/subscriptions/_index.html.haml
...pp/views/projects/settings/subscriptions/_index.html.haml
+5
-4
ee/app/views/projects/settings/subscriptions/_project.html.haml
.../views/projects/settings/subscriptions/_project.html.haml
+4
-0
ee/changelogs/unreleased/unsubscribe-pipeline-subscriptions.yml
...ngelogs/unreleased/unsubscribe-pipeline-subscriptions.yml
+5
-0
ee/spec/features/projects/settings/pipeline_subscriptions_spec.rb
...features/projects/settings/pipeline_subscriptions_spec.rb
+14
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/views/projects/settings/subscriptions/_index.html.haml
View file @
a56a02ee
...
...
@@ -20,8 +20,9 @@
%tr
%th
=
_
(
"Project"
)
%th
=
_
(
"Author"
)
%th
%tbody
-
@project
.
upstream_project
s
.
each
do
|
project
|
=
render
'projects/settings/subscriptions/project'
,
project:
project
-
@project
.
downstream_project
s
.
each
do
|
project
|
=
render
'projects/settings/subscriptions/project'
,
project:
project
-
@project
.
upstream_project
_subscriptions
.
each
do
|
subscription
|
=
render
'projects/settings/subscriptions/project'
,
project:
subscription
.
upstream_project
,
subscription:
subscription
-
@project
.
downstream_project
_subscriptions
.
each
do
|
subscription
|
=
render
'projects/settings/subscriptions/project'
,
project:
subscription
.
downstream_project
,
subscription:
subscription
ee/app/views/projects/settings/subscriptions/_project.html.haml
View file @
a56a02ee
-
tooltip
=
_
(
'Delete subscription'
)
%tr
%td
=
project
.
name
%td
=
user_avatar_without_link
(
user:
project
.
owner
,
size:
32
)
=
project
.
owner
.
name
%td
.gl-text-right
=
link_to
project_subscription_path
(
@project
,
subscription
.
id
),
method: :delete
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
,
testid:
'delete-subscription'
},
class:
"gl-button btn btn-danger"
do
=
sprite_icon
(
'close'
,
size:
16
,
css_class:
'gl-icon'
)
ee/changelogs/unreleased/unsubscribe-pipeline-subscriptions.yml
0 → 100644
View file @
a56a02ee
---
title
:
Delete pipeline subscriptions from the UI
merge_request
:
45166
author
:
type
:
added
ee/spec/features/projects/settings/pipeline_subscriptions_spec.rb
View file @
a56a02ee
...
...
@@ -56,4 +56,18 @@ RSpec.describe 'Project Subscriptions', :js do
expect
(
page
).
to
have_content
(
'This project path either does not exist or you do not have access.'
)
end
it
'subscription is removed successfully'
do
within
'#pipeline-subscriptions'
do
within
'form'
do
fill_in
'upstream_project_path'
,
with:
upstream_project
.
full_path
click_on
'Subscribe'
end
end
find
(
'[data-testid="delete-subscription"]'
).
click
expect
(
page
).
to
have_content
(
'Subscription successfully deleted.'
)
end
end
locale/gitlab.pot
View file @
a56a02ee
...
...
@@ -8606,6 +8606,9 @@ msgstr ""
msgid "Delete source branch"
msgstr ""
msgid "Delete subscription"
msgstr ""
msgid "Delete this attachment"
msgstr ""
...
...
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