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
1eaad45e
Commit
1eaad45e
authored
Aug 12, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary window exports.
parent
c9f94fec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/merge_conflict_data_provider.js.es6
app/assets/javascripts/merge_conflict_data_provider.js.es6
+2
-2
app/assets/javascripts/merge_conflict_resolver.js.es6
app/assets/javascripts/merge_conflict_resolver.js.es6
+1
-1
No files found.
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file @
1eaad45e
const HEAD_HEADER_TEXT = 'HEAD//our changes';
const HEAD_HEADER_TEXT = 'HEAD//our changes';
const ORIGIN_HEADER_TEXT = 'origin//their changes';
const ORIGIN_HEADER_TEXT = 'origin//their changes';
const HEAD_BUTTON_TITLE = 'Use ours';
const HEAD_BUTTON_TITLE = 'Use ours';
const ORIGIN_BUTTON_TITLE = 'Use theirs';
const ORIGIN_BUTTON_TITLE = 'Use theirs';
window.MergeConflictDataProvider = class MergeConflictDataProvider {
class MergeConflictDataProvider {
getInitialData() {
getInitialData() {
const diffViewType = $.cookie('diff_view');
const diffViewType = $.cookie('diff_view');
...
...
app/assets/javascripts/merge_conflict_resolver.js.es6
View file @
1eaad45e
//= require lib/vue
//= require lib/vue
window.MergeConflictResolver =
class MergeConflictResolver {
class MergeConflictResolver {
constructor() {
constructor() {
this.dataProvider = new MergeConflictDataProvider()
this.dataProvider = new MergeConflictDataProvider()
...
...
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