Force notifications to SAML email address for dedicated users
What does this MR do?
What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ee/issues/5332
This MR needs to wait for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9663/diffs
CE backport: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25739
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
EE specific content should be in the top level /ee
folder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan? -
Security reports checked/validated by reviewer
Merge request reports
Activity
changed milestone to %11.9
added 1 commit
- 861e5393 - Update service to respect group managed rules
1 Warning This merge request includes more than 10 commits. Please rebase these commits into a smaller number of commits. Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer frontend Paul Slaughter ( @pslaughter
)Phil Hughes ( @iamphill
)backend Peter Leitzen ( @splattael
)Robert Speicher ( @rspeicher
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖Hi @mksionek,
Please add labels to your merge request, this helps triage community merge requests.
Thanks for your help!
You are welcome to help improve this comment.
added auto updated label
added 1st contribution Manage [DEPRECATED] authentication devopsmanage priority2 ~2975006 labels
removed 1st contribution label
added 585 commits
-
8e0c0fa3...87f9a074 - 581 commits from branch
master
- 3e7519c0 - Add separate partial for email settings
- 50df5a3a - Update service to respect group managed rules
- b90dc3de - Add separate partial for notification email
- 3582e4e7 - Add help-block in the view
Toggle commit list-
8e0c0fa3...87f9a074 - 581 commits from branch
mentioned in issue #9372 (closed)
added 2 commits
added 504 commits
-
b181d86b...195940f9 - 503 commits from branch
master
- 103e3e4c - Merge branch 'master' into force-notification-to-saml-email-ee
-
b181d86b...195940f9 - 503 commits from branch
assigned to @jamedjo
- Resolved by James Edwards-Jones
- Resolved by James Edwards-Jones
- Resolved by James Edwards-Jones
- Resolved by James Edwards-Jones
@mksionek Looks good, I've added a few suggestions mostly on CE/EE code reuse
assigned to @mksionek
assigned to @jamedjo
Is this what you had in mind @jamedjo ?
- Resolved by James Edwards-Jones
assigned to @mksionek
added 2 commits
assigned to @jameslopez
- Resolved by James Lopez
- Resolved by Gosia Ksionek
- Resolved by Gosia Ksionek
- Resolved by James Lopez
assigned to @mksionek
added 2 commits
assigned to @jameslopez
changed milestone to %11.10
LGTM! @mksionek I would suggest resolving discussions that you tackled - it makes it easier to do a second round so I know I don't have to double-check things :)
@mksionek it looks like there are some merge conflicts, please resolve and I'll merge :)
assigned to @mksionek
added 1468 commits
-
58193718...ba47c0da - 1449 commits from branch
master
- 26482c70 - Add separate partial for email settings
- d190b109 - Update service to respect group managed rules
- bb44df34 - Add separate partial for notification email
- 2c4e7522 - Add help-block in the view
- bcf84ed3 - Update commented out methods
- fbfeb83a - Fix rubocop issues
- 257c04ca - Add copy to notifications page
- fe302800 - Add changelog changes
- 11788564 - Add cr remarks
- 20d28a40 - Refactor views into partials
- 4904a279 - Add ee partial
- 199f11d1 - Refactor partial to avoid duplication
- c9d48fea - Refactor ee partial to reuse ce one
- 7787d4da - Use different naming
- 5727c9e5 - Modify partials to respect ce changes
- 7331eaf1 - Add cr remarks
- ec50e1f7 - Add line between setup and expectations
- 24be7d8c - Add cr remarks
- 0d457214 - Fix failing specs
Toggle commit list-
58193718...ba47c0da - 1449 commits from branch
assigned to @jameslopez
@mksionek thanks! I squashed automatically but it's better if you get the commits squashed ealier :) Thanks again!
mentioned in commit 5e68bd3d
mentioned in issue gitlab-org/release/tasks#731 (closed)
added Enterprise Edition label
mentioned in epic &2777 (closed)