CE upstream

CE changes https://gitlab.com/gitlab-org/gitlab-ce/compare/d636efbe26ee51030bb108d889c2ef867570358a...0c36b810abede73b3cf59f951e7467dbac54ec98?expand_all_diffs=1

app/views/projects/_merge_request_settings.html.haml

-<<<<<<< HEAD
 %fieldset.merge-requests-feature.append-bottom-default
   %h5.prepend-top-0
     Merge requests
@@ -99,27 +98,11 @@
       .help-block
         Builds need to be configured to enable this feature.
         = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_build_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
+    .checkbox
+      = f.label :only_allow_merge_if_all_discussions_are_resolved do
+        = f.check_box :only_allow_merge_if_all_discussions_are_resolved
+        %strong Only allow merge requests to be merged if all discussions are resolved
 :javascript
   new UsersSelect();
   new GroupsSelect();
-=======
-.merge-requests-feature
-  %fieldset.builds-feature
-    %hr
-    %h5.prepend-top-0
-      Merge Requests
-    .form-group
-      .checkbox
-        = f.label :only_allow_merge_if_build_succeeds do
-          = f.check_box :only_allow_merge_if_build_succeeds
-          %strong Only allow merge requests to be merged if the build succeeds
-          %br
-          %span.descr
-            Builds need to be configured to enable this feature.
-            = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_when_build_succeeds', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
-      .checkbox
-        = f.label :only_allow_merge_if_all_discussions_are_resolved do
-          = f.check_box :only_allow_merge_if_all_discussions_are_resolved
-          %strong Only allow merge requests to be merged if all discussions are resolved
->>>>>>> c392b0cc24ba40e3fed920c6c693cb24665193af