Commit 3164796c authored by Nick Thomas's avatar Nick Thomas

Fix CE->EE conflicts in assets

parent 8fb73dcc
...@@ -9,10 +9,7 @@ ...@@ -9,10 +9,7 @@
/* global MilestoneSelect */ /* global MilestoneSelect */
/* global Commit */ /* global Commit */
/* global CommitsList */ /* global CommitsList */
<<<<<<< HEAD
/* global NewCommitForm */ /* global NewCommitForm */
=======
>>>>>>> ce/master
/* global NewBranchForm */ /* global NewBranchForm */
/* global NotificationsForm */ /* global NotificationsForm */
/* global NotificationsDropdown */ /* global NotificationsDropdown */
...@@ -31,10 +28,7 @@ ...@@ -31,10 +28,7 @@
/* global MergeRequest */ /* global MergeRequest */
/* global Compare */ /* global Compare */
/* global CompareAutocomplete */ /* global CompareAutocomplete */
<<<<<<< HEAD
/* global PathLocks */ /* global PathLocks */
=======
>>>>>>> ce/master
/* global ProjectFindFile */ /* global ProjectFindFile */
/* global ProjectNew */ /* global ProjectNew */
/* global ProjectShow */ /* global ProjectShow */
...@@ -82,9 +76,6 @@ import initSettingsPanels from './settings_panels'; ...@@ -82,9 +76,6 @@ import initSettingsPanels from './settings_panels';
import initExperimentalFlags from './experimental_flags'; import initExperimentalFlags from './experimental_flags';
import OAuthRememberMe from './oauth_remember_me'; import OAuthRememberMe from './oauth_remember_me';
import PerformanceBar from './performance_bar'; 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 GpgBadges from './gpg_badges';
import initNotes from './init_notes'; import initNotes from './init_notes';
import initLegacyFilters from './init_legacy_filters'; import initLegacyFilters from './init_legacy_filters';
...@@ -350,7 +341,6 @@ import AuditLogs from './audit_logs'; ...@@ -350,7 +341,6 @@ import AuditLogs from './audit_logs';
container: '.js-commit-pipeline-graph', container: '.js-commit-pipeline-graph',
}).bindEvents(); }).bindEvents();
$('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath); $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
<<<<<<< HEAD
break; break;
case 'projects:activity': case 'projects:activity':
new gl.Activities(); new gl.Activities();
...@@ -358,27 +348,13 @@ import AuditLogs from './audit_logs'; ...@@ -358,27 +348,13 @@ import AuditLogs from './audit_logs';
break; break;
case 'projects:commits:show': case 'projects:commits:show':
CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit); CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit);
=======
break;
case 'projects:activity':
>>>>>>> ce/master
new gl.Activities(); new gl.Activities();
shortcut_handler = new ShortcutsNavigation(); shortcut_handler = new ShortcutsNavigation();
GpgBadges.fetch();
break; break;
<<<<<<< HEAD
case 'projects:edit': case 'projects:edit':
new UsersSelect(); new UsersSelect();
break; 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': case 'projects:show':
shortcut_handler = new ShortcutsNavigation(); shortcut_handler = new ShortcutsNavigation();
new NotificationsForm(); new NotificationsForm();
...@@ -392,12 +368,9 @@ import AuditLogs from './audit_logs'; ...@@ -392,12 +368,9 @@ import AuditLogs from './audit_logs';
case 'projects:edit': case 'projects:edit':
setupProjectEdit(); setupProjectEdit();
break; break;
<<<<<<< HEAD
=======
case 'projects:imports:show': case 'projects:imports:show':
new ProjectImport(); new ProjectImport();
break; break;
>>>>>>> ce/master
case 'projects:pipelines:new': case 'projects:pipelines:new':
new NewBranchForm($('.js-new-pipeline-form')); new NewBranchForm($('.js-new-pipeline-form'));
break; break;
...@@ -455,7 +428,7 @@ import AuditLogs from './audit_logs'; ...@@ -455,7 +428,7 @@ import AuditLogs from './audit_logs';
new TreeView(); new TreeView();
new BlobViewer(); new BlobViewer();
new NewCommitForm($('.js-create-dir-form')); new NewCommitForm($('.js-create-dir-form'));
<<<<<<< HEAD
if (document.querySelector('.js-tree-content').dataset.pathLocksAvailable === 'true') { if (document.querySelector('.js-tree-content').dataset.pathLocksAvailable === 'true') {
PathLocks.init( PathLocks.init(
...@@ -464,8 +437,6 @@ import AuditLogs from './audit_logs'; ...@@ -464,8 +437,6 @@ import AuditLogs from './audit_logs';
); );
} }
=======
>>>>>>> ce/master
$('#tree-slider').waitForImages(function() { $('#tree-slider').waitForImages(function() {
gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath); gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
}); });
......
/* eslint-disable no-new */ /* eslint-disable no-new */
/* global MilestoneSelect */ /* global MilestoneSelect */
/* global LabelsSelect */ /* global LabelsSelect */
<<<<<<< HEAD
/* global WeightSelect */ /* global WeightSelect */
=======
>>>>>>> ce/master
/* global IssuableContext */ /* global IssuableContext */
/* global Sidebar */ /* global Sidebar */
...@@ -15,10 +12,7 @@ export default () => { ...@@ -15,10 +12,7 @@ export default () => {
full_path: sidebarOptions.fullPath, full_path: sidebarOptions.fullPath,
}); });
new LabelsSelect(); new LabelsSelect();
<<<<<<< HEAD
new WeightSelect(); new WeightSelect();
=======
>>>>>>> ce/master
new IssuableContext(sidebarOptions.currentUser); new IssuableContext(sidebarOptions.currentUser);
gl.Subscription.bindAll('.subscription'); gl.Subscription.bindAll('.subscription');
new gl.DueDateSelectors(); new gl.DueDateSelectors();
......
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
/* global MilestoneSelect */ /* global MilestoneSelect */
/* global IssueStatusSelect */ /* global IssueStatusSelect */
/* global SubscriptionSelect */ /* global SubscriptionSelect */
<<<<<<< HEAD
/* global WeightSelect */ /* global WeightSelect */
=======
>>>>>>> ce/master
import UsersSelect from './users_select'; import UsersSelect from './users_select';
...@@ -16,8 +13,5 @@ export default () => { ...@@ -16,8 +13,5 @@ export default () => {
new MilestoneSelect(); new MilestoneSelect();
new IssueStatusSelect(); new IssueStatusSelect();
new SubscriptionSelect(); new SubscriptionSelect();
<<<<<<< HEAD
new WeightSelect(); new WeightSelect();
=======
>>>>>>> ce/master
}; };
...@@ -26,14 +26,11 @@ import Cookies from 'js-cookie'; ...@@ -26,14 +26,11 @@ import Cookies from 'js-cookie';
$projectCloneField.val(url); $projectCloneField.val(url);
$cloneBtnText.text($this.text()); $cloneBtnText.text($this.text());
<<<<<<< HEAD
$('#modal-geo-info').data({ $('#modal-geo-info').data({
cloneUrlSecondary: $this.attr('href'), cloneUrlSecondary: $this.attr('href'),
cloneUrlPrimary: $this.data('primaryUrl') || '' cloneUrlPrimary: $this.data('primaryUrl') || ''
}); });
=======
>>>>>>> ce/master
return $('.clone').text(url); return $('.clone').text(url);
}); });
// Ref switcher // Ref switcher
......
<<<<<<< HEAD
document.addEventListener('DOMContentLoaded', () => {
const importBtnTooltip = 'Please enter a valid project name.';
const $importBtnWrapper = $('.import_gitlab_project');
=======
let hasUserDefinedProjectPath = false; let hasUserDefinedProjectPath = false;
const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => { const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => {
...@@ -40,7 +35,6 @@ const bindEvents = () => { ...@@ -40,7 +35,6 @@ const bindEvents = () => {
if ($newProjectForm.length !== 1) { if ($newProjectForm.length !== 1) {
return; return;
} }
>>>>>>> ce/master
$('.how_to_import_link').on('click', (e) => { $('.how_to_import_link').on('click', (e) => {
e.preventDefault(); e.preventDefault();
...@@ -53,21 +47,6 @@ const bindEvents = () => { ...@@ -53,21 +47,6 @@ const bindEvents = () => {
$('.btn_import_gitlab_project').on('click', () => { $('.btn_import_gitlab_project').on('click', () => {
const importHref = $('a.btn_import_gitlab_project').attr('href'); 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()}`); $('.btn_import_gitlab_project').attr('href', `${importHref}?namespace_id=${$('#project_namespace_id').val()}&path=${$projectPath.val()}`);
}); });
...@@ -81,7 +60,6 @@ const bindEvents = () => { ...@@ -81,7 +60,6 @@ const bindEvents = () => {
$projectPath.on('keyup', () => { $projectPath.on('keyup', () => {
hasUserDefinedProjectPath = $projectPath.val().trim().length > 0; hasUserDefinedProjectPath = $projectPath.val().trim().length > 0;
if (hasUserDefinedProjectPath) { if (hasUserDefinedProjectPath) {
>>>>>>> ce/master
$('.btn_import_gitlab_project').attr('disabled', false); $('.btn_import_gitlab_project').attr('disabled', false);
$importBtnWrapper.attr('title', ''); $importBtnWrapper.attr('title', '');
$importBtnWrapper.removeClass('has-tooltip'); $importBtnWrapper.removeClass('has-tooltip');
...@@ -91,14 +69,6 @@ const bindEvents = () => { ...@@ -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.disable();
$projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl, $projectPath)); $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl, $projectPath));
...@@ -113,4 +83,3 @@ export default { ...@@ -113,4 +83,3 @@ export default {
bindEvents, bindEvents,
deriveProjectPathFromUrl, deriveProjectPathFromUrl,
}; };
>>>>>>> ce/master
...@@ -206,13 +206,10 @@ $general-hover-transition-duration: 100ms; ...@@ -206,13 +206,10 @@ $general-hover-transition-duration: 100ms;
$general-hover-transition-curve: linear; $general-hover-transition-curve: linear;
$highlight-changes-color: rgb(235, 255, 232); $highlight-changes-color: rgb(235, 255, 232);
$performance-bar-height: 35px; $performance-bar-height: 35px;
<<<<<<< HEAD
$issue-box-upcoming-bg: #8f8f8f; $issue-box-upcoming-bg: #8f8f8f;
$pages-group-name-color: #4c4e54; $pages-group-name-color: #4c4e54;
$ldap-members-override-bg: $orange-50; $ldap-members-override-bg: $orange-50;
=======
>>>>>>> ce/master
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment