Resolve conflicts

app/services/projects/destroy_service.rb

@@ -34,7 +34,6 @@ module Projects
 
         unless remove_legacy_registry_tags
           raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
-<<<<<<< HEAD
         end
 
         unless remove_repository(repo_path)
@@ -43,8 +42,6 @@ module Projects
 
         unless remove_repository(wiki_path)
           raise_error('Failed to remove wiki repository. Please try again or contact administrator.')
-=======
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
         end
       end
 

app/views/projects/blob/_blob.html.haml

@@ -26,16 +26,6 @@
 #blob-content-holder.blob-content-holder
   %article.file-holder
     = render "projects/blob/header", blob: blob
-<<<<<<< HEAD
-    - if current_user
-      .js-file-fork-suggestion-section.file-fork-suggestion.hidden
-        %span.file-fork-suggestion-note
-          You don't have permission to edit this file. Try forking this project to edit the file.
-        = link_to 'Fork', fork_path, method: :post, class: 'btn btn-grouped btn-inverted btn-new'
-        %button.js-cancel-fork-suggestion.btn.btn-grouped{ type: 'button' }
-          Cancel
-=======
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
 
     - if blob.empty?
       .file-content.code

app/views/shared/issuable/_search_bar.html.haml

@@ -73,10 +73,7 @@
                         {{name}}
                       %span.dropdown-light-content
                         @{{username}}
-<<<<<<< HEAD
-=======
 
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
             - unless board && board.milestone_id
               #js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'clock-o', hint: 'milestone', tag: '%milestone' } }
                 %ul{ data: { dropdown: true } }
@@ -94,10 +91,7 @@
                   %li.filter-dropdown-item
                     %button.btn.btn-link.js-data-value
                       {{title}}
-<<<<<<< HEAD
-=======
 
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
             #js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'tag', hint: 'label', tag: '~label', type: 'array' } }
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { value: 'none' } }

config/routes/project.rb

@@ -166,10 +166,7 @@ constraints(ProjectUrlConstrainer.new) do
           resources :push_access_levels, only: [:destroy]
         end
       end
-<<<<<<< HEAD
 
-=======
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
       resources :protected_tags, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
 
       resources :variables, only: [:index, :show, :update, :create, :destroy]

db/schema.rb

@@ -11,12 +11,8 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20170408033905) do
-=======
-ActiveRecord::Schema.define(version: 20170407140450) do
 
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "pg_trgm"

doc/README.md

@@ -44,14 +44,11 @@ All technical content published by GitLab lives in the documentation, including:
 - [Upload your GitLab License](user/admin_area/license.md) Upload the license you purchased for GitLab Enterprise Edition to unlock its features.
 - [Audit Events](administration/audit_events.md) Check how user access changed in projects and groups.
 - [Access restrictions](user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols) Define which Git access protocols can be used to talk to GitLab
-<<<<<<< HEAD
+- [Authentication/Authorization](administration/auth/README.md) Configure external authentication with LDAP, SAML, CAS and additional Omniauth providers.
 - [Changing the appearance of the login page](customization/branded_login_page.md) Make the login page branded for your GitLab instance.
 - [Email](tools/email.md) Email GitLab users from GitLab
 - [Push Rules](push_rules/push_rules.md) Advanced push rules for your project.
 - [Help message](customization/help_message.md) Set information about administrators of your GitLab instance.
-=======
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
-- [Authentication/Authorization](administration/auth/README.md) Configure external authentication with LDAP, SAML, CAS and additional Omniauth providers.
 - [Changing the appearance of the login page](customization/branded_login_page.md) Make the login page branded for your GitLab instance.
 - [Email](tools/email.md) Email GitLab users from GitLab
 - [Push Rules](push_rules/push_rules.md) Advanced push rules for your project.

doc/api/issues.md

@@ -112,11 +112,7 @@ GET /groups/:id/issues?search=issue+title+or+description
 
 | Attribute   | Type           | Required | Description                                                                                                                 |
 |-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------|
-<<<<<<< HEAD
-| `id`        | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user  |
-=======
 | `id`        | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user               |
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
 | `state`     | string         | no       | Return all issues or just those that are `opened` or `closed`                                                               |
 | `labels`    | string         | no       | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels |
 | `iids`      | Array[integer] | no       | Return only the issues having the given `iid`                                                                               |

features/steps/project/merge_requests.rb

@@ -623,11 +623,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I should not see merge button' do
     page.within '.mr-state-widget' do
-<<<<<<< HEAD
       expect(page).not_to have_button('Accept merge mequest')
-=======
-      expect(page).not_to have_button('Accept merge request')
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
     end
   end
 

spec/javascripts/droplab/drop_down_spec.js

@@ -130,11 +130,7 @@ describe('DropDown', function () {
     beforeEach(function () {
       this.list = { dispatchEvent: () => {} };
       this.dropdown = { hide: () => {}, list: this.list, addSelectedClass: () => {} };
-<<<<<<< HEAD
       this.event = { preventDefault: () => {}, target: {} };
-=======
-      this.event = { preventDefault: () => {}, target: 'target' };
->>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
       this.customEvent = {};
       this.closestElement = {};