Skip to content
Snippets Groups Projects

Force notifications to SAML email address for dedicated users

Merged Gosia Ksionek requested to merge force-notification-to-saml-email-ee into master
All threads resolved!

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?

Edited by Gosia Ksionek

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @mksionek Looks good, I've added a few suggestions mostly on CE/EE code reuse

  • Gosia Ksionek added 5 commits

    added 5 commits

    Compare with previous version

  • assigned to @jamedjo

  • Author Maintainer

    Is this what you had in mind @jamedjo ?

  • James Edwards-Jones resolved all discussions

    resolved all discussions

  • James Edwards-Jones approved this merge request

    approved this merge request

  • Gosia Ksionek added 2 commits

    added 2 commits

    • f5990fe1 - Use different naming
    • 107d5920 - Modify partials to respect ce changes

    Compare with previous version

  • James Lopez
  • James Lopez
  • assigned to @mksionek

  • Gosia Ksionek added 1 commit

    added 1 commit

    Compare with previous version

  • Gosia Ksionek added 2 commits

    added 2 commits

    Compare with previous version

  • Gosia Ksionek added 1 commit

    added 1 commit

    Compare with previous version

  • Gosia Ksionek changed milestone to %11.10

    changed milestone to %11.10

  • James Lopez resolved all discussions

    resolved all discussions

  • 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 :)

  • Author Maintainer

    sure!

  • assigned to @mksionek

  • Gosia Ksionek added 1468 commits

    added 1468 commits

    Compare with previous version

  • @mksionek thanks! I squashed automatically but it's better if you get the commits squashed ealier :) Thanks again!

  • merged

  • James Lopez mentioned in commit 5e68bd3d

    mentioned in commit 5e68bd3d

  • mentioned in epic &2777 (closed)

  • Please register or sign in to reply
    Loading