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
44c82950
Commit
44c82950
authored
Feb 27, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restore CE version of route to reduce possibility for conflicts
parent
8a0a927f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
app/assets/javascripts/pages/projects/merge_conflicts/index.js
...ssets/javascripts/pages/projects/merge_conflicts/index.js
+7
-0
No files found.
app/assets/javascripts/pages/projects/merge_conflicts/index.js
0 → 100644
View file @
44c82950
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initMergeConflicts
from
'
~/merge_conflicts/merge_conflicts_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initSidebarBundle
();
initMergeConflicts
();
});
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