Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
56ae4a9a
Commit
56ae4a9a
authored
Oct 09, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts for app/assets/javascripts/dispatcher.js
parent
1eb05471
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
15 deletions
+5
-15
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-15
No files found.
app/assets/javascripts/dispatcher.js
View file @
56ae4a9a
...
@@ -7,12 +7,6 @@
...
@@ -7,12 +7,6 @@
/* global IssuableForm */
/* global IssuableForm */
/* global LabelsSelect */
/* global LabelsSelect */
/* global MilestoneSelect */
/* global MilestoneSelect */
<<<<<<<
HEAD
/* global Commit */
/* global CommitsList */
/* global NewCommitForm */
=======
>>>>>>>
ce
-
com
/
master
/* global NewBranchForm */
/* global NewBranchForm */
/* global NotificationsForm */
/* global NotificationsForm */
/* global NotificationsDropdown */
/* global NotificationsDropdown */
...
@@ -590,7 +584,11 @@ import initGroupAnalytics from './init_group_analytics';
...
@@ -590,7 +584,11 @@ import initGroupAnalytics from './init_group_analytics';
case
'
admin:impersonation_tokens:index
'
:
case
'
admin:impersonation_tokens:index
'
:
new
gl
.
DueDateSelectors
();
new
gl
.
DueDateSelectors
();
break
;
break
;
<<<<<<<
HEAD
case
'
projects:clusters:show
'
:
import
(
/* webpackChunkName: "clusters" */
'
./clusters
'
)
.
then
(
cluster
=>
new
cluster
.
default
())
// eslint-disable-line new-cap
.
catch
(()
=>
{});
break
;
case
'
admin:licenses:new
'
:
case
'
admin:licenses:new
'
:
const
$licenseFile
=
$
(
'
.license-file
'
);
const
$licenseFile
=
$
(
'
.license-file
'
);
const
$licenseKey
=
$
(
'
.license-key
'
);
const
$licenseKey
=
$
(
'
.license-key
'
);
...
@@ -608,14 +606,6 @@ import initGroupAnalytics from './init_group_analytics';
...
@@ -608,14 +606,6 @@ import initGroupAnalytics from './init_group_analytics';
case
'
groups:analytics:show
'
:
case
'
groups:analytics:show
'
:
initGroupAnalytics
();
initGroupAnalytics
();
break
;
break
;
=======
case
'
projects:clusters:show
'
:
import
(
/* webpackChunkName: "clusters" */
'
./clusters
'
)
.
then
(
cluster
=>
new
cluster
.
default
())
// eslint-disable-line new-cap
.
catch
(()
=>
{});
break
;
>>>>>>>
ce
-
com
/
master
}
}
switch
(
path
[
0
])
{
switch
(
path
[
0
])
{
case
'
sessions
'
:
case
'
sessions
'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment