Resolve conflicts

app/controllers/autocomplete_controller.rb

@@ -2,11 +2,7 @@ class AutocompleteController < ApplicationController
   AWARD_EMOJI_MAX = 100
 
   skip_before_action :authenticate_user!, only: [:users, :award_emojis]
-<<<<<<< HEAD
-  before_action :load_project, only: [:users, :project_groups]
-=======
   before_action :load_project, only: [:users]
->>>>>>> upstream/master
   before_action :find_users, only: [:users]
 
   def users
@@ -63,11 +59,7 @@ class AutocompleteController < ApplicationController
       .limit(AWARD_EMOJI_MAX)
       .where(user: current_user)
       .group(:name)
-<<<<<<< HEAD
-      .order(count: :desc, name: :asc)
-=======
       .order('count_all DESC, name ASC')
->>>>>>> upstream/master
       .count
 
     # Transform from hash to array to guarantee json order

app/finders/issuable_finder.rb

@@ -366,7 +366,6 @@ class IssuableFinder
     items
   end
 
-<<<<<<< HEAD
   def by_weight(items)
     return items unless weights?
 
@@ -392,8 +391,6 @@ class IssuableFinder
     params[:weight] == Issue::WEIGHT_ANY
   end
 
-=======
->>>>>>> upstream/master
   def by_my_reaction_emoji(items)
     if params[:my_reaction_emoji].present? && current_user
       items = items.awarded(current_user, params[:my_reaction_emoji])

app/models/repository.rb

@@ -1117,13 +1117,8 @@ class Repository
     false
   end
 
-<<<<<<< HEAD
   def fetch_remote(remote, forced: false, ssh_auth: nil, no_tags: false)
-    gitlab_shell.fetch_remote(repository_storage_path, disk_path, remote, ssh_auth: ssh_auth, forced: forced, no_tags: no_tags)
-=======
-  def fetch_remote(remote, forced: false, no_tags: false)
-    gitlab_shell.fetch_remote(raw_repository, remote, forced: forced, no_tags: no_tags)
->>>>>>> upstream/master
+    gitlab_shell.fetch_remote(raw_repository, remote, ssh_auth: ssh_auth, forced: forced, no_tags: no_tags)
   end
 
   def fetch_ref(source_path, source_ref, target_ref)

app/views/layouts/nav/_new_admin_sidebar.html.haml

@@ -47,11 +47,7 @@
               %span
                 ConvDev Index
 
-<<<<<<< HEAD
       = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles audit_logs)) do
-=======
-      = nav_link(controller: %w(conversational_development_index system_info background_jobs logs health_check requests_profiles)) do
->>>>>>> upstream/master
         = sidebar_link admin_conversational_development_index_path, title: _('Monitoring') do
           .nav-icon-container
             = custom_icon('monitoring')

app/views/layouts/nav/_new_group_sidebar.html.haml

@@ -7,11 +7,7 @@
         .sidebar-context-title
           = @group.name
     %ul.sidebar-top-level-items
-<<<<<<< HEAD
       = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
-=======
-      = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
->>>>>>> upstream/master
         = sidebar_link group_path(@group), title: _('Group overview') do
           .nav-icon-container
             = custom_icon('project')
@@ -75,11 +71,7 @@
           %span.nav-item-name
             Members
       - if current_user && can?(current_user, :admin_group, @group)
-<<<<<<< HEAD
         = nav_link(path: %w[groups#projects groups#edit ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]) do
-=======
-        = nav_link(path: %w[groups#projects groups#edit ci_cd#show]) do
->>>>>>> upstream/master
           = sidebar_link edit_group_path(@group), title: _('Settings') do
             .nav-icon-container
               = custom_icon('settings')

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

@@ -104,7 +104,6 @@
                     %gl-emoji
                     %span.js-data-value.prepend-left-10
                       {{name}}
-<<<<<<< HEAD
 
             - if type == :issues || type == :boards || type == :boards_modal
               #js-dropdown-weight.filtered-search-input-dropdown-menu.dropdown-menu
@@ -121,8 +120,6 @@
                     %li.filter-dropdown-item{ 'data-value' => "#{weight}" }
                       %button.btn.btn-link= weight
 
-=======
->>>>>>> upstream/master
           %button.clear-search.hidden{ type: 'button' }
             = icon('times')
         .filter-dropdown-container

config/routes.rb

@@ -36,10 +36,7 @@ Rails.application.routes.draw do
   get '/autocomplete/users/:id' => 'autocomplete#user'
   get '/autocomplete/projects' => 'autocomplete#projects'
   get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
-<<<<<<< HEAD
   get '/autocomplete/project_groups' => 'autocomplete#project_groups'
-=======
->>>>>>> upstream/master
 
   # Search
   get 'search' => 'search#show'

doc/README.md

@@ -83,14 +83,11 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
   - [Create a branch](user/project/repository/web_editor.md#create-a-new-branch)
   - [Protected branches](user/project/protected_branches.md#protected-branches)
   - [Delete merged branches](user/project/repository/branches/index.md#delete-merged-branches)
-<<<<<<< HEAD
+- Commits
+  - [Signing commits](user/project/repository/gpg_signed_commits/index.md): use GPG to sign your commits.
 - **(EES/EEP)** [Repository Mirroring](workflow/repository_mirroring.md)
 - **(EES/EEP)** [Push rules](push_rules/push_rules.md): Additional control over pushes to your project.
 - **(EEP)** [File Locking](user/project/file_lock.md): Lock a file to avoid merge conflicts.
-=======
-- Commits
-  - [Signing commits](user/project/repository/gpg_signed_commits/index.md): use GPG to sign your commits.
->>>>>>> upstream/master
 
 ### Issues and Merge Requests (MRs)
 

doc/api/issues.md

@@ -101,10 +101,8 @@ Example response:
       "user_notes_count": 1,
       "due_date": "2016-07-22",
       "web_url": "http://example.com/example/example/issues/6",
-<<<<<<< HEAD
       "confidential": false,
-      "weight": null
-=======
+      "weight": null,
       "time_stats": {
          "time_estimate": 0,
          "total_time_spent": 0,
@@ -112,7 +110,6 @@ Example response:
          "human_total_time_spent": null
       },
       "confidential": false
->>>>>>> upstream/master
    }
 ]
 ```
@@ -209,10 +206,8 @@ Example response:
       "user_notes_count": 1,
       "due_date": null,
       "web_url": "http://example.com/example/example/issues/1",
-<<<<<<< HEAD
       "confidential": false,
-      "weight": null
-=======
+      "weight": null,
       "time_stats": {
          "time_estimate": 0,
          "total_time_spent": 0,
@@ -220,7 +215,6 @@ Example response:
          "human_total_time_spent": null
       },
       "confidential": false
->>>>>>> upstream/master
    }
 ]
 ```
@@ -318,10 +312,8 @@ Example response:
       "user_notes_count": 1,
       "due_date": "2016-07-22",
       "web_url": "http://example.com/example/example/issues/1",
-<<<<<<< HEAD
       "confidential": false,
-      "weight": null
-=======
+      "weight": null,
       "time_stats": {
          "time_estimate": 0,
          "total_time_spent": 0,
@@ -329,7 +321,6 @@ Example response:
          "human_total_time_spent": null
       },
       "confidential": false
->>>>>>> upstream/master
    }
 ]
 ```

doc/api/merge_requests.md

@@ -188,10 +188,7 @@ Parameters:
     "approvals_before_merge": null
     "should_remove_source_branch": true,
     "force_remove_source_branch": false,
-<<<<<<< HEAD
     "squash": false,
-    "web_url": "http://example.com/example/example/merge_requests/1"
-=======
     "web_url": "http://example.com/example/example/merge_requests/1",
     "time_stats": {
       "time_estimate": 0,
@@ -199,7 +196,6 @@ Parameters:
       "human_time_estimate": null,
       "human_total_time_spent": null
     }
->>>>>>> upstream/master
   }
 ]
 ```
@@ -269,10 +265,7 @@ Parameters:
   "approvals_before_merge": null
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
-<<<<<<< HEAD
   "squash": false,
-  "web_url": "http://example.com/example/example/merge_requests/1"
-=======
   "web_url": "http://example.com/example/example/merge_requests/1",
   "time_stats": {
     "time_estimate": 0,
@@ -280,7 +273,6 @@ Parameters:
     "human_time_estimate": null,
     "human_total_time_spent": null
   }
->>>>>>> upstream/master
 }
 ```
 
@@ -492,10 +484,7 @@ order for it to take effect:
   "approvals_before_merge": null
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
-<<<<<<< HEAD
   "squash": false,
-  "web_url": "http://example.com/example/example/merge_requests/1"
-=======
   "web_url": "http://example.com/example/example/merge_requests/1",
   "time_stats": {
     "time_estimate": 0,
@@ -503,7 +492,6 @@ order for it to take effect:
     "human_time_estimate": null,
     "human_total_time_spent": null
   }
->>>>>>> upstream/master
 }
 ```
 
@@ -584,10 +572,7 @@ Must include at least one non-required attribute from above.
   "approvals_before_merge": null
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
-<<<<<<< HEAD
   "squash": false,
-  "web_url": "http://example.com/example/example/merge_requests/1"
-=======
   "web_url": "http://example.com/example/example/merge_requests/1",
   "time_stats": {
     "time_estimate": 0,
@@ -595,7 +580,6 @@ Must include at least one non-required attribute from above.
     "human_time_estimate": null,
     "human_total_time_spent": null
   }
->>>>>>> upstream/master
 }
 ```
 
@@ -694,10 +678,7 @@ Parameters:
   "approvals_before_merge": null
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
-<<<<<<< HEAD
   "squash": false,
-  "web_url": "http://example.com/example/example/merge_requests/1"
-=======
   "web_url": "http://example.com/example/example/merge_requests/1",
   "time_stats": {
     "time_estimate": 0,
@@ -705,7 +686,6 @@ Parameters:
     "human_time_estimate": null,
     "human_total_time_spent": null
   }
->>>>>>> upstream/master
 }
 ```
 
@@ -902,10 +882,7 @@ Parameters:
   "approvals_before_merge": null
   "should_remove_source_branch": true,
   "force_remove_source_branch": false,
-<<<<<<< HEAD
   "squash": false,
-  "web_url": "http://example.com/example/example/merge_requests/1"
-=======
   "web_url": "http://example.com/example/example/merge_requests/1",
   "time_stats": {
     "time_estimate": 0,
@@ -913,7 +890,6 @@ Parameters:
     "human_time_estimate": null,
     "human_total_time_spent": null
   }
->>>>>>> upstream/master
 }
 ```
 

lib/api/branches.rb

@@ -130,11 +130,7 @@ module API
 
         commit = user_project.repository.commit(branch.dereferenced_target)
 
-<<<<<<< HEAD
-        destroy_conditionally!(commit, last_update_field: :authored_date) do
-=======
         destroy_conditionally!(commit, last_updated: commit.authored_date) do
->>>>>>> upstream/master
           result = DeleteBranchService.new(user_project, current_user)
                     .execute(params[:branch])
 

lib/api/helpers.rb

@@ -21,15 +21,10 @@ module API
       end
     end
 
-<<<<<<< HEAD
-    def destroy_conditionally!(resource, last_update_field: :updated_at)
-      check_unmodified_since!(resource.public_send(last_update_field))
-=======
     def destroy_conditionally!(resource, last_updated: nil)
       last_updated ||= resource.updated_at
 
       check_unmodified_since!(last_updated)
->>>>>>> upstream/master
 
       status 204
       if block_given?

lib/api/tags.rb

@@ -70,11 +70,7 @@ module API
 
         commit = user_project.repository.commit(tag.dereferenced_target)
 
-<<<<<<< HEAD
-        destroy_conditionally!(commit, last_update_field: :authored_date) do
-=======
         destroy_conditionally!(commit, last_updated: commit.authored_date) do
->>>>>>> upstream/master
           result = ::Tags::DestroyService.new(user_project, current_user)
                     .execute(params[:tag_name])
 

spec/features/issues/filtered_search/search_bar_spec.rb

@@ -100,11 +100,7 @@ describe 'Search bar', js: true do
       find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-<<<<<<< HEAD
-      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 6)
-=======
       expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
->>>>>>> upstream/master
       expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset)
     end
   end

spec/fixtures/api/schemas/public_api/v4/merge_requests.json

@@ -73,17 +73,14 @@
       "should_remove_source_branch": { "type": ["boolean", "null"] },
       "force_remove_source_branch": { "type": ["boolean", "null"] },
       "web_url": { "type": "uri" },
-<<<<<<< HEAD
       "approvals_before_merge": { "type": ["integer", "null"] },
-      "squash": { "type": "boolean" }
-=======
+      "squash": { "type": "boolean" },
       "time_stats": {
         "time_estimate": { "type": "integer" },
         "total_time_spent": { "type": "integer" },
         "human_time_estimate": { "type": ["string", "null"] },
         "human_total_time_spent": { "type": ["string", "null"] }
       }
->>>>>>> upstream/master
     },
     "required": [
       "id", "iid", "project_id", "title", "description",

spec/requests/api/projects_spec.rb

@@ -1257,7 +1257,6 @@ describe API::Projects do
       before do
         create(:project_group_link, group: group, project: project)
       end
-<<<<<<< HEAD
 
       it 'returns 204 when deleting a group share' do
         delete api("/projects/#{project.id}/share/#{group.id}", user)
@@ -1266,8 +1265,6 @@ describe API::Projects do
         expect(project.project_group_links).to be_empty
       end
 
-=======
-
       it 'returns 204 when deleting a group share' do
         delete api("/projects/#{project.id}/share/#{group.id}", user)
 
@@ -1275,7 +1272,6 @@ describe API::Projects do
         expect(project.project_group_links).to be_empty
       end
 
->>>>>>> upstream/master
       it_behaves_like '412 response' do
         let(:request) { api("/projects/#{project.id}/share/#{group.id}", user) }
       end