diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-14 19:50:21 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-14 19:50:21 +0000 |
| commit | f76b3106e85411c3526b88ae366ef7619241cb85 (patch) | |
| tree | cac8a51afa92e4e87f44240af940f7c6f3e7ac58 /app | |
| parent | e9d6651f42507d87aeb84a17fc6c0b6298bce856 (diff) | |
| parent | 78c8a3e37d27383ef6d452ef4c6124d49cd99aa7 (diff) | |
| download | gitlab-ce-f76b3106e85411c3526b88ae366ef7619241cb85.tar.gz | |
Merge branch 'dm-commit-email-select-options' into 'master'
Fix bug causing not all emails to show up in commit email selectbox
Closes #54045
See merge request gitlab-org/gitlab-ce!23079
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/profiles_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb index 42f9a1213e9..df318de740a 100644 --- a/app/helpers/profiles_helper.rb +++ b/app/helpers/profiles_helper.rb @@ -7,7 +7,7 @@ module ProfilesHelper [ [s_("Profiles|Use a private email - %{email}").html_safe % { email: private_email }, Gitlab::PrivateCommitEmail::TOKEN], - verified_emails + *verified_emails ] end |