Fixed conflicts

app/assets/javascripts/project_new.js

@@ -17,15 +17,6 @@
     }
 
     ProjectNew.prototype.toggleSettings = function() {
-<<<<<<< HEAD
-      this._showOrHide('#project_builds_enabled', '.builds-feature');
-      this._showOrHide('#project_merge_requests_enabled', '.merge-requests-feature');
-      return this._showOrHide('#project_issues_enabled', '.issues-feature');
-    };
-
-    ProjectNew.prototype.toggleSettingsOnclick = function() {
-      return $('#project_builds_enabled, #project_merge_requests_enabled, #project_issues_enabled').on('click', this.toggleSettings);
-=======
       var self = this;
 
       this.$selects.each(function () {
@@ -38,7 +29,6 @@
 
     ProjectNew.prototype.toggleSettingsOnclick = function() {
       this.$selects.on('change', this.toggleSettings);
->>>>>>> ce/master
     };
 
     ProjectNew.prototype._showOrHide = function(checkElement, container) {

app/views/projects/_issues_settings.html.haml

-%fieldset.features.append-bottom-0.issue-feature
+%fieldset.features.append-bottom-0.issues-feature
   %h5.prepend-top-0
     Issues
   .form-group

app/views/projects/_merge_request_settings.html.haml

-<<<<<<< HEAD
-%fieldset.merge-request-feature.append-bottom-default
+%fieldset.merge-requests-feature.append-bottom-default
   %h5.prepend-top-0
     Merge requests
 
@@ -79,7 +78,7 @@
         - if @project.approvers.empty?
           %li There are no approvers
 
-  .form-group
+  .form-group.builds-feature
     .checkbox
       = f.label :only_allow_merge_if_build_succeeds do
         = f.check_box :only_allow_merge_if_build_succeeds
@@ -90,19 +89,3 @@
 
 :javascript
   new UsersSelect();
-=======
-.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('workflow/merge_requests', anchor: 'only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
->>>>>>> ce/master