Merge branch 'ce-to-ee-2018-11-14' into 'master'

CE upstream - 2018-11-14 21:21 UTC

Closes gitlab-ce#54045

See merge request gitlab-org/gitlab-ee!8456

app/assets/stylesheets/pages/notes.scss

@@ -914,3 +914,23 @@ $note-form-margin-left: 72px;
     }
   }
 }
+
+//This needs to be deleted when Snippet/Commit comments are convered to Vue
+// See https://gitlab.com/gitlab-org/gitlab-ce/issues/53918#note_117038785
+.unstyled-comments {
+
+  .discussion-header {
+    padding: $gl-padding;
+    border-bottom: 1px solid $border-color;
+  }
+
+  .note-wrapper.outlined {
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+  }
+
+  .discussion-form-container {
+    padding: $gl-padding;
+  }
+}

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
 

app/views/discussions/_discussion.html.haml

 - expanded = discussion.expanded?
-%li.note.note-discussion.timeline-entry
+%li.note.note-discussion.timeline-entry.unstyled-comments
   .timeline-entry-inner
-    .timeline-icon
-      = link_to user_path(discussion.author) do
-        = image_tag avatar_icon_for_user(discussion.author), class: "avatar s40"
     .timeline-content
       .discussion.js-toggle-container{ data: { discussion_id: discussion.id } }
         .discussion-header
+          .timeline-icon
+            = link_to user_path(discussion.author) do
+              = image_tag avatar_icon_for_user(discussion.author), class: "avatar s40"
           .discussion-actions
             %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
               - if expanded

changelogs/unreleased/dm-commit-email-select-options.yml

+---
+title: Fix bug causing not all emails to show up in commit email selectbox
+merge_request:
+author:
+type: fixed

spec/helpers/profiles_helper_spec.rb

@@ -4,12 +4,17 @@ describe ProfilesHelper do
   describe '#commit_email_select_options' do
     it 'returns an array with private commit email along with all the verified emails' do
       user = create(:user)
+      create(:email, user: user)
+      confirmed_email1 = create(:email, :confirmed, user: user)
+      confirmed_email2 = create(:email, :confirmed, user: user)
+
       private_email = user.private_commit_email
 
-      verified_emails = user.verified_emails - [private_email]
       emails = [
         ["Use a private email - #{private_email}", Gitlab::PrivateCommitEmail::TOKEN],
-        verified_emails
+        user.email,
+        confirmed_email1.email,
+        confirmed_email2.email
       ]
 
       expect(helper.commit_email_select_options(user)).to match_array(emails)