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
4b73d468
Commit
4b73d468
authored
Feb 21, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix admin email notification recipient group select list
Fix
https://gitlab.com/gitlab-org/gitlab-ee/issues/1656
parent
2792a502
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
1 deletion
+33
-1
app/assets/javascripts/admin_email_select.js
app/assets/javascripts/admin_email_select.js
+1
-1
changelogs/unreleased-ee/1656-fix-admin-user-email-recipient-select-list.yml
...ed-ee/1656-fix-admin-user-email-recipient-select-list.yml
+4
-0
spec/features/admin/admin_emails_spec.rb
spec/features/admin/admin_emails_spec.rb
+28
-0
No files found.
app/assets/javascripts/admin_email_select.js
View file @
4b73d468
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
all
=
{
all
=
{
id
:
"
all
"
id
:
"
all
"
};
};
data
=
$
.
merge
([
all
],
groups
[
0
],
projects
[
0
]);
data
=
[
all
].
concat
(
groups
[
0
],
projects
[
0
]);
return
query
.
callback
({
return
query
.
callback
({
results
:
data
results
:
data
});
});
...
...
changelogs/unreleased-ee/1656-fix-admin-user-email-recipient-select-list.yml
0 → 100644
View file @
4b73d468
---
title
:
Fix admin email notification recipient group select list
merge_request
:
author
:
spec/features/admin/admin_emails_spec.rb
0 → 100644
View file @
4b73d468
require
'spec_helper'
describe
"Admin::Emails"
,
feature:
true
,
js:
true
do
include
WaitForAjax
let!
(
:current_user
)
{
login_as
:admin
}
let!
(
:group
)
{
create
(
:group
)
}
let!
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
describe
"GET /admin/email"
do
before
do
visit
admin_email_path
end
describe
'Recipient group select'
do
it
"includes groups and projects"
do
find
(
'.ajax-admin-email-select'
).
click
wait_for_ajax
expect
(
page
).
to
have_selector
(
'.ajax-admin-email-dropdown li'
,
count:
3
)
group_names
=
page
.
all
(
'.ajax-admin-email-dropdown li .group-name'
)
expect
(
group_names
[
0
].
text
).
to
eq
(
'All'
)
expect
(
group_names
[
1
].
text
).
to
eq
(
group
.
name
)
expect
(
find
(
'.ajax-admin-email-dropdown li .project-name'
).
text
).
to
eq
(
project
.
name
)
end
end
end
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