Resolve conflicts

app/assets/javascripts/dispatcher.js

@@ -329,13 +329,6 @@ import AuditLogs from './audit_logs';
           }).bindEvents();
           $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
           break;
-<<<<<<< HEAD
-        case 'projects:commits:show':
-          shortcut_handler = new ShortcutsNavigation();
-          GpgBadges.fetch();
-          break;
-=======
->>>>>>> upstream/master
         case 'projects:activity':
           new gl.Activities();
           shortcut_handler = new ShortcutsNavigation();
@@ -344,6 +337,7 @@ import AuditLogs from './audit_logs';
           CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit);
           new gl.Activities();
           shortcut_handler = new ShortcutsNavigation();
+          GpgBadges.fetch();
           break;
         case 'projects:edit':
           new UsersSelect();

app/views/projects/commits/show.html.haml

@@ -33,21 +33,8 @@
             = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form') do
               = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
           .control
-<<<<<<< HEAD
-            = link_to _("Create merge request"), create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success'
-
-        .control
-          = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form', data: { 'signatures-path' => namespace_project_signatures_path }) do
-            = search_field_tag :search, params[:search], { placeholder: _('Filter by commit message'), id: 'commits-search', class: 'form-control search-text-input input-short', spellcheck: false }
-        .control
-          = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
-            = icon("rss")
-
-  = render 'projects/commits/mirror_status'
-=======
             = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
               = icon("rss")
->>>>>>> upstream/master
 
     = render 'projects/commits/mirror_status'
 

config/webpack.config.js

@@ -78,11 +78,8 @@ var config = {
     stl_viewer:           './blob/stl_viewer.js',
     terminal:             './terminal/terminal_bundle.js',
     u2f:                  ['vendor/u2f'],
-<<<<<<< HEAD
-=======
     ui_development_kit:   './ui_development_kit.js',
     users:                './users/index.js',
->>>>>>> upstream/master
     raven:                './raven/index.js',
     vue_merge_request_widget: './vue_merge_request_widget/index.js',
     test:                 './test.js',

spec/models/project_wiki_spec.rb

@@ -25,11 +25,7 @@ describe ProjectWiki do
 
   describe '#web_url' do
     it 'returns the full web URL to the wiki' do
-<<<<<<< HEAD
-      expect(subject.web_url).to match("https?://[^\/]+/#{project.path_with_namespace}/wikis/home")
-=======
       expect(subject.web_url).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}/wikis/home")
->>>>>>> upstream/master
     end
   end