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!
2 files
+ 3
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -9,8 +9,8 @@
@@ -9,8 +9,8 @@
{ help: s_("Profiles|This email will be displayed on your public profile"), include_blank: s_("Profiles|Do not show on profile") },
{ help: s_("Profiles|This email will be displayed on your public profile"), include_blank: s_("Profiles|Do not show on profile") },
control_class: 'select2 input-lg', disabled: email_change_disabled
control_class: 'select2 input-lg', disabled: email_change_disabled
- commit_email_link_url = help_page_path('user/profile/index', anchor: 'commit-email', target: '_blank')
- commit_email_link_url = help_page_path('user/profile/index', anchor: 'commit-email', target: '_blank')
- commit_email_link_start = '<a href="%{url}">'.html_safe % { url: zones_link_url }
- commit_email_link_start = '<a href="%{url}">'.html_safe % { url: commit_email_link_url }
- commit_email_docs_link = s_('Profiles|This email will be used for web based operations, such as edits and merges. %{commit_email_link_start}Learn more%{commit_email_link_end}').html_safe % { commit_email_link_start: zones_link_start, commit_email_link_end: '</a>'.html_safe }
- commit_email_docs_link = s_('Profiles|This email will be used for web based operations, such as edits and merges. %{commit_email_link_start}Learn more%{commit_email_link_end}').html_safe % { commit_email_link_start: commit_email_link_start, commit_email_link_end: '</a>'.html_safe }
= form.select :commit_email, options_for_select(commit_email_select_options(@user), selected: selected_commit_email(@user)),
= form.select :commit_email, options_for_select(commit_email_select_options(@user), selected: selected_commit_email(@user)),
{ help: commit_email_docs_link },
{ help: commit_email_docs_link },
control_class: 'select2 input-lg', disabled: email_change_disabled
control_class: 'select2 input-lg', disabled: email_change_disabled
Loading