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
f55774d4
Commit
f55774d4
authored
Dec 04, 2020
by
serenafang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add checkbox for member event webhook
First step to adding UI
parent
a23bc839
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
app/views/shared/web_hooks/_form.html.haml
app/views/shared/web_hooks/_form.html.haml
+6
-0
ee/spec/controllers/groups/hooks_controller_spec.rb
ee/spec/controllers/groups/hooks_controller_spec.rb
+4
-2
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/views/shared/web_hooks/_form.html.haml
View file @
f55774d4
...
...
@@ -48,6 +48,12 @@
%strong
=
s_
(
'Webhooks|Confidential Issues events'
)
%p
.text-muted.ml-1
=
s_
(
'Webhooks|This URL will be triggered when a confidential issue is created/updated/merged'
)
%li
=
form
.
check_box
:member_events
,
class:
'form-check-input'
=
form
.
label
:member_events
,
class:
'list-label form-check-label ml-1'
do
%strong
=
s_
(
'Webhooks|Member events'
)
%p
.text-muted.ml-1
=
s_
(
'Webhooks|This URL will be triggered when a member is added to a group'
)
%li
=
form
.
check_box
:merge_requests_events
,
class:
'form-check-input'
=
form
.
label
:merge_requests_events
,
class:
'list-label form-check-label ml-1'
do
...
...
ee/spec/controllers/groups/hooks_controller_spec.rb
View file @
f55774d4
...
...
@@ -39,7 +39,8 @@ RSpec.describe Groups::HooksController do
token:
'TEST TOKEN'
,
url:
'http://example.com'
,
wiki_page_events:
true
,
deployment_events:
true
deployment_events:
true
,
member_events:
true
}
post
:create
,
params:
{
group_id:
group
.
to_param
,
hook:
hook_params
}
...
...
@@ -81,7 +82,8 @@ RSpec.describe Groups::HooksController do
url:
'http://example.com'
,
wiki_page_events:
true
,
deployment_events:
true
,
releases_events:
true
releases_events:
true
,
member_events:
true
}
end
...
...
locale/gitlab.pot
View file @
f55774d4
...
...
@@ -30881,6 +30881,9 @@ msgstr ""
msgid "Webhooks|Job events"
msgstr ""
msgid "Webhooks|Member events"
msgstr ""
msgid "Webhooks|Merge request events"
msgstr ""
...
...
@@ -30917,6 +30920,9 @@ msgstr ""
msgid "Webhooks|This URL will be triggered when a confidential issue is created/updated/merged"
msgstr ""
msgid "Webhooks|This URL will be triggered when a member is added to a group"
msgstr ""
msgid "Webhooks|This URL will be triggered when a merge request is created/updated/merged"
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