Merge branch 'mr-conflict-specs-enable' into 'master'

Re-enables merge conflicts resolution spec

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

spec/features/merge_request/user_resolves_conflicts_spec.rb

@@ -44,9 +44,7 @@ describe 'Merge request > User resolves conflicts', :js do
 
       within find('.diff-file', text: 'files/ruby/regex.rb') do
         expect(page).to have_selector('.line_content.new', text: "def username_regexp")
-        expect(page).not_to have_selector('.line_content.new', text: "def username_regex")
         expect(page).to have_selector('.line_content.new', text: "def project_name_regexp")
-        expect(page).not_to have_selector('.line_content.new', text: "def project_name_regex")
         expect(page).to have_selector('.line_content.new', text: "def path_regexp")
         expect(page).to have_selector('.line_content.new', text: "def archive_formats_regexp")
         expect(page).to have_selector('.line_content.new', text: "def git_reference_regexp")
@@ -110,12 +108,8 @@ describe 'Merge request > User resolves conflicts', :js do
           click_link('conflicts', href: %r{/conflicts\Z})
         end
 
-        # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
-        # include_examples "conflicts are resolved in Interactive mode"
-        # include_examples "conflicts are resolved in Edit inline mode"
-
-        it 'prevents RSpec/EmptyExampleGroup' do
-        end
+        include_examples "conflicts are resolved in Interactive mode"
+        include_examples "conflicts are resolved in Edit inline mode"
       end
 
       context 'in Parallel view mode' do
@@ -124,12 +118,8 @@ describe 'Merge request > User resolves conflicts', :js do
           click_button 'Side-by-side'
         end
 
-        # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
-        # include_examples "conflicts are resolved in Interactive mode"
-        # include_examples "conflicts are resolved in Edit inline mode"
-
-        it 'prevents RSpec/EmptyExampleGroup' do
-        end
+        include_examples "conflicts are resolved in Interactive mode"
+        include_examples "conflicts are resolved in Edit inline mode"
       end
     end