Fix CE->EE conflicts in assets

app/assets/javascripts/dispatcher.js

@@ -9,10 +9,7 @@
 /* global MilestoneSelect */
 /* global Commit */
 /* global CommitsList */
-<<<<<<< HEAD
 /* global NewCommitForm */
-=======
->>>>>>> ce/master
 /* global NewBranchForm */
 /* global NotificationsForm */
 /* global NotificationsDropdown */
@@ -31,10 +28,7 @@
 /* global MergeRequest */
 /* global Compare */
 /* global CompareAutocomplete */
-<<<<<<< HEAD
 /* global PathLocks */
-=======
->>>>>>> ce/master
 /* global ProjectFindFile */
 /* global ProjectNew */
 /* global ProjectShow */
@@ -82,9 +76,6 @@ import initSettingsPanels from './settings_panels';
 import initExperimentalFlags from './experimental_flags';
 import OAuthRememberMe from './oauth_remember_me';
 import PerformanceBar from './performance_bar';
-import initNotes from './init_notes';
-import initLegacyFilters from './init_legacy_filters';
-import initIssuableSidebar from './init_issuable_sidebar';
 import GpgBadges from './gpg_badges';
 import initNotes from './init_notes';
 import initLegacyFilters from './init_legacy_filters';
@@ -350,7 +341,6 @@ import AuditLogs from './audit_logs';
             container: '.js-commit-pipeline-graph',
           }).bindEvents();
           $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
-<<<<<<< HEAD
           break;
         case 'projects:activity':
           new gl.Activities();
@@ -358,27 +348,13 @@ import AuditLogs from './audit_logs';
           break;
         case 'projects:commits:show':
           CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit);
-=======
-          break;
-        case 'projects:activity':
->>>>>>> ce/master
           new gl.Activities();
           shortcut_handler = new ShortcutsNavigation();
+          GpgBadges.fetch();
           break;
-<<<<<<< HEAD
         case 'projects:edit':
           new UsersSelect();
           break;
-        case 'projects:imports:show':
-          new ProjectImport();
-=======
-        case 'projects:commits:show':
-          CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit);
-          new gl.Activities();
-          shortcut_handler = new ShortcutsNavigation();
-          GpgBadges.fetch();
->>>>>>> ce/master
-          break;
         case 'projects:show':
           shortcut_handler = new ShortcutsNavigation();
           new NotificationsForm();
@@ -392,12 +368,9 @@ import AuditLogs from './audit_logs';
         case 'projects:edit':
           setupProjectEdit();
           break;
-<<<<<<< HEAD
-=======
         case 'projects:imports:show':
           new ProjectImport();
           break;
->>>>>>> ce/master
         case 'projects:pipelines:new':
           new NewBranchForm($('.js-new-pipeline-form'));
           break;
@@ -455,7 +428,7 @@ import AuditLogs from './audit_logs';
           new TreeView();
           new BlobViewer();
           new NewCommitForm($('.js-create-dir-form'));
-<<<<<<< HEAD
+
 
           if (document.querySelector('.js-tree-content').dataset.pathLocksAvailable === 'true') {
             PathLocks.init(
@@ -464,8 +437,6 @@ import AuditLogs from './audit_logs';
             );
           }
 
-=======
->>>>>>> ce/master
           $('#tree-slider').waitForImages(function() {
             gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
           });

app/assets/javascripts/init_issuable_sidebar.js

 /* eslint-disable no-new */
 /* global MilestoneSelect */
 /* global LabelsSelect */
-<<<<<<< HEAD
 /* global WeightSelect */
-=======
->>>>>>> ce/master
 /* global IssuableContext */
 /* global Sidebar */
 
@@ -15,10 +12,7 @@ export default () => {
     full_path: sidebarOptions.fullPath,
   });
   new LabelsSelect();
-<<<<<<< HEAD
   new WeightSelect();
-=======
->>>>>>> ce/master
   new IssuableContext(sidebarOptions.currentUser);
   gl.Subscription.bindAll('.subscription');
   new gl.DueDateSelectors();

app/assets/javascripts/init_legacy_filters.js

@@ -3,10 +3,7 @@
 /* global MilestoneSelect */
 /* global IssueStatusSelect */
 /* global SubscriptionSelect */
-<<<<<<< HEAD
 /* global WeightSelect */
-=======
->>>>>>> ce/master
 
 import UsersSelect from './users_select';
 
@@ -16,8 +13,5 @@ export default () => {
   new MilestoneSelect();
   new IssueStatusSelect();
   new SubscriptionSelect();
-<<<<<<< HEAD
   new WeightSelect();
-=======
->>>>>>> ce/master
 };

app/assets/javascripts/project.js

@@ -26,14 +26,11 @@ import Cookies from 'js-cookie';
         $projectCloneField.val(url);
         $cloneBtnText.text($this.text());
 
-<<<<<<< HEAD
         $('#modal-geo-info').data({
           cloneUrlSecondary: $this.attr('href'),
           cloneUrlPrimary: $this.data('primaryUrl') || ''
         });
 
-=======
->>>>>>> ce/master
         return $('.clone').text(url);
       });
       // Ref switcher

app/assets/javascripts/projects/project_new.js

-<<<<<<< HEAD
-document.addEventListener('DOMContentLoaded', () => {
-  const importBtnTooltip = 'Please enter a valid project name.';
-  const $importBtnWrapper = $('.import_gitlab_project');
-=======
 let hasUserDefinedProjectPath = false;
 
 const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => {
@@ -40,7 +35,6 @@ const bindEvents = () => {
   if ($newProjectForm.length !== 1) {
     return;
   }
->>>>>>> ce/master
 
   $('.how_to_import_link').on('click', (e) => {
     e.preventDefault();
@@ -53,21 +47,6 @@ const bindEvents = () => {
 
   $('.btn_import_gitlab_project').on('click', () => {
     const importHref = $('a.btn_import_gitlab_project').attr('href');
-<<<<<<< HEAD
-    $('.btn_import_gitlab_project').attr('href', `${importHref}?namespace_id=${$('#project_namespace_id').val()}&path=${$('#project_path').val()}`);
-  });
-
-  $('.btn_import_gitlab_project').attr('disabled', !$('#project_path').val().trim().length);
-  $importBtnWrapper.attr('title', importBtnTooltip);
-
-  $('#new_project').on('submit', () => {
-    const $path = $('#project_path');
-    $path.val($path.val().trim());
-  });
-
-  $('#project_path').on('keyup', () => {
-    if ($('#project_path').val().trim().length) {
-=======
     $('.btn_import_gitlab_project').attr('href', `${importHref}?namespace_id=${$('#project_namespace_id').val()}&path=${$projectPath.val()}`);
   });
 
@@ -81,7 +60,6 @@ const bindEvents = () => {
   $projectPath.on('keyup', () => {
     hasUserDefinedProjectPath = $projectPath.val().trim().length > 0;
     if (hasUserDefinedProjectPath) {
->>>>>>> ce/master
       $('.btn_import_gitlab_project').attr('disabled', false);
       $importBtnWrapper.attr('title', '');
       $importBtnWrapper.removeClass('has-tooltip');
@@ -91,14 +69,6 @@ const bindEvents = () => {
     }
   });
 
-<<<<<<< HEAD
-  $('#project_import_url').disable();
-  $('.import_git').on('click', () => {
-    const $projectImportUrl = $('#project_import_url');
-    $projectImportUrl.attr('disabled', !$projectImportUrl.attr('disabled'));
-  });
-});
-=======
   $projectImportUrl.disable();
   $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl, $projectPath));
 
@@ -113,4 +83,3 @@ export default {
   bindEvents,
   deriveProjectPathFromUrl,
 };
->>>>>>> ce/master

app/assets/stylesheets/framework/variables.scss

@@ -206,13 +206,10 @@ $general-hover-transition-duration: 100ms;
 $general-hover-transition-curve: linear;
 $highlight-changes-color: rgb(235, 255, 232);
 $performance-bar-height: 35px;
-<<<<<<< HEAD
 
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 $ldap-members-override-bg: $orange-50;
-=======
->>>>>>> ce/master
 
 
 /*