kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove unnecessary window exports.

Browse source
This commit is contained in:
Fatih Acet 2016-08-12 21:36:55 +03:00
parent c9f94fec4d
commit 1eaad45e71
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file

@ -1,10 +1,10 @@
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');

2
app/assets/javascripts/merge_conflict_resolver.js.es6
View file

@ -1,6 +1,6 @@
//= require lib/vue //= require lib/vue
window.MergeConflictResolver = class MergeConflictResolver { class MergeConflictResolver {
constructor() { constructor() {
this.dataProvider = new MergeConflictDataProvider() this.dataProvider = new MergeConflictDataProvider()