Merge branch '_acet-fix-spec' into 'master'

Fix one disabled spec of comment posting.

See merge request gitlab-org/gitlab-ce!20747

spec/features/merge_request/user_posts_diff_notes_spec.rb

@@ -185,11 +185,11 @@ describe 'Merge request > User posts diff notes', :js do
     end
 
     describe 'posting a note' do
-      xit 'adds as discussion' do
+      it 'adds as discussion' do
         expect(page).to have_css('.js-temp-notes-holder', count: 2)
 
         should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'), asset_form_reset: false)
-        expect(page).to have_css('.notes_holder .note', count: 1)
+        expect(page).to have_css('.notes_holder .note.note-discussion', count: 1)
         expect(page).to have_css('.js-temp-notes-holder', count: 1)
         expect(page).to have_button('Reply...')
       end