Fixed conflicts

app/views/projects/_builds_settings.html.haml

@@ -59,18 +59,11 @@
         %strong Public builds
       .help-block Allow everyone to access builds for Public and Internal projects
 
-<<<<<<< HEAD
   - if @project.mirror?
     = render 'shared/mirror_trigger_builds_setting', f: f
 
-  .form-group
-    = f.label :runners_token, "Runners token", class: 'control-label'
-    .col-sm-10
-      = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
-      %p.help-block The secure token used to checkout project.
-=======
   .form-group.append-bottom-0
     = f.label :runners_token, "Runners token", class: 'label-light'
     = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
     %p.help-block The secure token used to checkout project.
->>>>>>> e6389dfee621090706d43d3107339934ca42f0ff
+

app/views/projects/_issues_settings.html.haml

-%fieldset.issues-feature
-  %legend
-    Issues:
-
+%fieldset.features.append-bottom-0.issues-feature
+  %h5.prepend-top-0
+    Issues
   .form-group
-    = f.label :issues_template, class: 'control-label' do
+    = f.label :issues_template, class: 'label-light' do
       Description template
-    .col-sm-10
-      = f.text_area :issues_template, class: "form-control", rows: 3
-
-
+    = f.text_area :issues_template, class: "form-control", rows: 3

app/views/projects/_merge_request_settings.html.haml

-%fieldset.merge-request-feature
-  %legend
-    Merge requests:
+%fieldset.merge-request-feature.append-bottom-default
+  %h5.prepend-top-0
+    Merge requests
 
   .form-group
-    = label_tag :merge_method_merge, class: 'control-label' do
+    = label_tag :merge_method_merge, class: 'label-light' do
       Merge method
-    .col-sm-10
-      .radio
-        = label_tag :project_merge_method_merge do
-          = f.radio_button :merge_method, :merge, class: "js-merge-method-radio"
-          %strong Merge commit
-          %br
-          %span.descr
-            A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
+    .radio
+      = label_tag :project_merge_method_merge do
+        = f.radio_button :merge_method, :merge, class: "js-merge-method-radio"
+        %strong Merge commit
+        %br
+        %span.descr
+          A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
 
-      .radio
-        = label_tag :project_merge_method_rebase_merge do
-          = f.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio"
-          %strong Merge commit with semi-linear history
-          %br
-          %span.descr
-            A merge commit is created for every merge, but merging is only allowed if the branch has been rebased.
-            This way you get a history that reads linearly (as with fast-forward merges), with the addition of merge commits.
-          %br
-          %span.descr
-            When the branch has not been rebased, the user is given the option to do so.
+    .radio
+      = label_tag :project_merge_method_rebase_merge do
+        = f.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio"
+        %strong Merge commit with semi-linear history
+        %br
+        %span.descr
+          A merge commit is created for every merge, but merging is only allowed if the branch has been rebased.
+          This way you get a history that reads linearly (as with fast-forward merges), with the addition of merge commits.
+        %br
+        %span.descr
+          When the branch has not been rebased, the user is given the option to do so.
 
-      .radio
-        = label_tag :project_merge_method_ff do
-          = f.radio_button :merge_method, :ff, class: "js-merge-method-radio"
-          %strong Fast-forward merge
-          %br
-          %span.descr
-            No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch has been rebased.
-          %br
-          %span.descr
-            When the branch has not been rebased, the user is given the option to do so.
+    .radio
+      = label_tag :project_merge_method_ff do
+        = f.radio_button :merge_method, :ff, class: "js-merge-method-radio"
+        %strong Fast-forward merge
+        %br
+        %span.descr
+          No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch has been rebased.
+        %br
+        %span.descr
+          When the branch has not been rebased, the user is given the option to do so.
 
   .form-group
-    = f.label :merge_requests_template, class: 'control-label' do
+    = f.label :merge_requests_template, class: 'label-light' do
       Description template
-    .col-sm-10
-      = f.text_area :merge_requests_template, class: "form-control", rows: 3
+    = f.text_area :merge_requests_template, class: "form-control", rows: 3
 
   .form-group
-    = f.label :approvals_before_merge, class: 'control-label' do
+    = f.label :approvals_before_merge, class: 'label-light' do
       Approvals required
-    .col-sm-10
-      = f.number_field :approvals_before_merge, class: "form-control", min: 0
-      .help-block
-        Number of users to approve a merge request before it can be accepted. 0 - approving is disabled
+    = f.number_field :approvals_before_merge, class: "form-control", min: 0
+    .help-block
+      Number of users to approve a merge request before it can be accepted. 0 - approving is disabled
 
   .form-group.reset-approvals-on-push
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = f.label :reset_approvals_on_push do
-          = f.check_box :reset_approvals_on_push
-          %span.descr Reset approvals on push
-          .help-block Approvals are reset when new data is pushed to the merge request
+    .checkbox
+      = f.label :reset_approvals_on_push do
+        = f.check_box :reset_approvals_on_push
+        %span.descr Reset approvals on push
+        .help-block Approvals are reset when new data is pushed to the merge request
 
   .form-group
-    = f.label :approver_ids, class: 'control-label' do
+    = f.label :approver_ids, class: 'label-light' do
       Approvers
-    .col-sm-10
-      = users_select_tag("project[approver_ids]", multiple: true, class: 'input-large', scope: :all, email_user: true)
-      .help-block
-        Add an approver suggestion for each merge request
+    = users_select_tag("project[approver_ids]", multiple: true, class: 'input-large', scope: :all, email_user: true)
+    .help-block
+      Add an approver suggestion for each merge request
 
-      .panel.panel-default.prepend-top-10
-        .panel-heading
-          Approvers
-          %small
-            (#{@project.approvers.count(:all)})
-        %ul.well-list
-          - @project.approvers.each do |approver|
-            %li
-              = link_to approver.user.name, approver.user
-              .pull-right
-                = link_to namespace_project_approver_path(@project.namespace, @project, approver), data: { confirm: "Are you sure you want to remove approver #{approver.user.name}"}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove approver' do
-                  = icon("sign-out")
-                  Remove
-          - if @project.approvers.empty?
-            %li There are no approvers
+    .panel.panel-default.prepend-top-10
+      .panel-heading
+        Approvers
+        %small
+          (#{@project.approvers.count(:all)})
+      %ul.well-list
+        - @project.approvers.each do |approver|
+          %li
+            = link_to approver.user.name, approver.user
+            .pull-right
+              = link_to namespace_project_approver_path(@project.namespace, @project, approver), data: { confirm: "Are you sure you want to remove approver #{approver.user.name}"}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove approver' do
+                = icon("sign-out")
+                Remove
+        - if @project.approvers.empty?
+          %li There are no approvers
 
 
 :javascript

app/views/projects/edit.html.haml

@@ -7,74 +7,6 @@
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit-project" }, authenticity_token: true do |f|
         %fieldset.append-bottom-0
           .form-group
-<<<<<<< HEAD
-            = f.label :tag_list, "Tags", class: 'control-label'
-            .col-sm-10
-              = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
-              %p.help-block Separate tags with commas.
-
-          %fieldset.features
-            %legend
-              Features:
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :issues_enabled do
-                    = f.check_box :issues_enabled
-                    %strong Issues
-                    %br
-                    %span.descr Lightweight issue tracking system for this project
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :merge_requests_enabled do
-                    = f.check_box :merge_requests_enabled
-                    %strong Merge Requests
-                    %br
-                    %span.descr Submit changes to be merged upstream
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :builds_enabled do
-                    = f.check_box :builds_enabled
-                    %strong Builds
-                    %br
-                    %span.descr Test and deploy your changes before merge
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :wiki_enabled do
-                    = f.check_box :wiki_enabled
-                    %strong Wiki
-                    %br
-                    %span.descr Pages for project documentation
-
-            .form-group
-              .col-sm-offset-2.col-sm-10
-                .checkbox
-                  = f.label :snippets_enabled do
-                    = f.check_box :snippets_enabled
-                    %strong Snippets
-                    %br
-                    %span.descr Share code pastes with others out of git repository
-
-            - if Gitlab.config.registry.enabled
-              .form-group
-                .col-sm-offset-2.col-sm-10
-                  .checkbox
-                    = f.label :container_registry_enabled do
-                      = f.check_box :container_registry_enabled
-                      %strong Container Registry
-                      %br
-                      %span.descr Enable Container Registry for this repository
-
-          = render 'issues_settings', f: f
-          = render 'merge_request_settings', f: f
-          = render 'builds_settings', f: f
-=======
             = f.label :name, class: 'label-light' do
               Project name
             = f.text_field :name, class: "form-control", id: "project_name_edit"
@@ -83,59 +15,9 @@
               Project description
               %span.light (optional)
             = f.text_area :description, class: "form-control", rows: 3, maxlength: 250
->>>>>>> e6389dfee621090706d43d3107339934ca42f0ff
 
           - unless @project.empty_repo?
             .form-group
-<<<<<<< HEAD
-              .col-sm-offset-2.col-sm-10
-                - if @project.avatar?
-                  = project_icon("#{@project.namespace.to_param}/#{@project.to_param}", alt: '', class: 'avatar project-avatar s160')
-                %p.light
-                  - if @project.avatar_in_git
-                    Project avatar in repository: #{ @project.avatar_in_git }
-                %p.light
-                  - if @project.avatar?
-                    You can change your project avatar here
-                  - else
-                    You can upload a project avatar here
-                %a.choose-btn.btn.btn-sm.js-choose-project-avatar-button
-                  %i.icon-paper-clip
-                  %span Choose File ...
-                &nbsp;
-                %span.file_name.js-avatar-filename File name...
-                = f.file_field :avatar, class: "js-project-avatar-input hidden"
-                .light The maximum file size allowed is 200KB.
-                - if @project.avatar?
-                  %hr
-                  = link_to 'Remove avatar', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
-
-          .form-actions
-            = f.submit 'Save changes', class: "btn btn-save"
-
-    .danger-settings
-      .panel.panel-default
-        .panel-heading Housekeeping
-        .errors-holder
-        .panel-body
-          %p
-            Runs a number of housekeeping tasks within the current repository,
-            such as compressing file revisions and removing unreachable objects.
-            %br
-
-          .form-actions
-            = link_to 'Housekeeping', housekeeping_namespace_project_path(@project.namespace, @project),
-                method: :post, class: "btn btn-default"
-
-      - if can? current_user, :archive_project, @project
-        - if @project.archived?
-          .panel.panel-success
-            .panel-heading
-              Unarchive project
-            .panel-body
-              %p
-                Unarchiving the project will mark its repository as active.
-=======
               = f.label :default_branch, "Default Branch", class: 'label-light'
               = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
         .form-group.project-visibility-level-holder
@@ -163,7 +45,6 @@
               = f.label :issues_enabled do
                 = f.check_box :issues_enabled
                 %strong Issues
->>>>>>> e6389dfee621090706d43d3107339934ca42f0ff
                 %br
                 %span.descr Lightweight issue tracking system for this project
           .form-group
@@ -203,6 +84,8 @@
                   %br
                   %span.descr Enable Container Registry for this repository
         %hr
+        = render 'issues_settings', f: f
+        = render 'merge_request_settings', f: f
         = render 'builds_settings', f: f
         %hr
         %fieldset.features.append-bottom-default