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
8516e113
Commit
8516e113
authored
Feb 08, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix MR widget approvals bundle
parent
40e3494d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
282 additions
and
287 deletions
+282
-287
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
...ripts/merge_request_widget/approvals/approvals_api.js.es6
+27
-25
app/assets/javascripts/merge_request_widget/approvals/approvals_bundle.js.es6
...ts/merge_request_widget/approvals/approvals_bundle.js.es6
+2
-4
app/assets/javascripts/merge_request_widget/approvals/approvals_store.js.es6
...pts/merge_request_widget/approvals/approvals_store.js.es6
+51
-53
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
...request_widget/approvals/components/approvals_body.js.es6
+79
-80
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
...quest_widget/approvals/components/approvals_footer.js.es6
+82
-83
app/assets/javascripts/merge_request_widget/widget_bundle.js.es6
...ets/javascripts/merge_request_widget/widget_bundle.js.es6
+10
-11
app/assets/javascripts/merge_request_widget/widget_store.js.es6
...sets/javascripts/merge_request_widget/widget_store.js.es6
+31
-31
No files found.
app/assets/javascripts/merge_request_widget/approvals/approvals_api.js.es6
View file @
8516e113
/* global Vue */
/* global Flash */
/* global Flash */
window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
const Vue = window.Vue;
require('./approvals_store');
require('./approvals_store');
(() => {
class ApprovalsApi {
class ApprovalsApi {
constructor(endpoint) {
constructor(endpoint) {
gl.ApprovalsApi = this;
gl.ApprovalsApi = this;
this.init(endpoint);
this.init(endpoint);
...
@@ -32,7 +34,7 @@ require('./approvals_store');
...
@@ -32,7 +34,7 @@ require('./approvals_store');
return Vue.http.delete(this.baseEndpoint).catch(() => new Flash(flashErrorMessage));
return Vue.http.delete(this.baseEndpoint).catch(() => new Flash(flashErrorMessage));
}
}
}
}
gl.ApprovalsApi = ApprovalsApi
;
window.gl = window.gl || {}
;
})()
;
window.gl.ApprovalsApi = ApprovalsApi
;
app/assets/javascripts/merge_request_widget/approvals/approvals_bundle.js.es6
View file @
8516e113
function requireAll(context) { return context.keys().map(context); }
require('./approvals_store');
require('./approvals_store');
require('./approvals_api');
require('./approvals_api');
require('./components/approvals_body');
require
All(require.context('./components', true, /^\.\/.*\.(js|es6)$/)
);
require
('./components/approvals_footer'
);
app/assets/javascripts/merge_request_widget/approvals/approvals_store.js.es6
View file @
8516e113
/* global Vue */
require('./approvals_api');
require('./approvals_api');
(() => {
let singleton;
let singleton;
class MergeRequestApprovalsStore {
class MergeRequestApprovalsStore {
constructor(rootStore) {
constructor(rootStore) {
if (!singleton) {
if (!singleton) {
singleton = this;
singleton = this;
...
@@ -60,6 +57,7 @@ require('./approvals_api');
...
@@ -60,6 +57,7 @@ require('./approvals_api');
assignToRootStore(key, data) {
assignToRootStore(key, data) {
return this.rootStore.assignToData(key, data);
return this.rootStore.assignToData(key, data);
}
}
}
}
gl.MergeRequestApprovalsStore = MergeRequestApprovalsStore;
})(window.gl || (window.gl = {}));
window.gl = window.gl || {};
window.gl.MergeRequestApprovalsStore = MergeRequestApprovalsStore;
app/assets/javascripts/merge_request_widget/approvals/components/approvals_body.js.es6
View file @
8516e113
/* global Vue */
/* global Vue */
const Vue = require('vue');
require('../approvals_store');
require('../approvals_store');
require('../approvals_api');
require('../approvals_api');
(() => {
Vue.component('approvals-body', {
Vue.component('approvals-body', {
name: 'approvals-body',
name: 'approvals-body',
props: {
props: {
approvedBy: {
approvedBy: {
...
@@ -91,5 +91,4 @@ require('../approvals_api');
...
@@ -91,5 +91,4 @@ require('../approvals_api');
</div>
</div>
</div>
</div>
`,
`,
});
});
})();
app/assets/javascripts/merge_request_widget/approvals/components/approvals_footer.js.es6
View file @
8516e113
/* global Vue */
/* global Vue */
const Vue = require('vue');
require('../approvals_store');
require('../approvals_store');
require('../../../vue_common_component/link_to_member_avatar');
require('../../../vue_common_component/link_to_member_avatar');
(() => {
Vue.component('approvals-footer', {
Vue.component('approvals-footer', {
name: 'approvals-footer',
name: 'approvals-footer',
props: {
props: {
approvedBy: {
approvedBy: {
...
@@ -89,5 +89,4 @@ require('../../../vue_common_component/link_to_member_avatar');
...
@@ -89,5 +89,4 @@ require('../../../vue_common_component/link_to_member_avatar');
</span>
</span>
</div>
</div>
`,
`,
});
});
})();
app/assets/javascripts/merge_request_widget/widget_bundle.js.es6
View file @
8516e113
/* global Vue */
const Vue = require('vue');
require('./widget_store');
require('./widget_store');
require('./approvals/approvals_bundle');
require('./approvals/approvals_bundle');
(() => {
window.gl = window.gl || {};
$(() => {
$(() => {
const rootEl = document.getElementById('merge-request-widget-app');
const rootEl = document.getElementById('merge-request-widget-app');
const widgetSharedStore = new gl.MergeRequestWidgetStore(rootEl);
const widgetSharedStore = new gl.MergeRequestWidgetStore(rootEl);
...
@@ -12,5 +12,4 @@ require('./approvals/approvals_bundle');
...
@@ -12,5 +12,4 @@ require('./approvals/approvals_bundle');
el: rootEl,
el: rootEl,
data: widgetSharedStore.data,
data: widgetSharedStore.data,
});
});
});
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/merge_request_widget/widget_store.js.es6
View file @
8516e113
require('./approvals/approvals_store');
require('./approvals/approvals_store');
(() => {
let singleton;
let singleton;
class MergeRequestWidgetStore {
class MergeRequestWidgetStore {
constructor(rootEl) {
constructor(rootEl) {
if (!singleton) {
if (!singleton) {
singleton = gl.MergeRequestWidget.Store = this;
singleton = gl.MergeRequestWidget.Store = this;
...
@@ -35,6 +34,7 @@ require('./approvals/approvals_store');
...
@@ -35,6 +34,7 @@ require('./approvals/approvals_store');
this.data[key] = val;
this.data[key] = val;
return val;
return val;
}
}
}
}
gl.MergeRequestWidgetStore = MergeRequestWidgetStore;
})(window.gl || (window.gl = {}));
window.gl = window.gl || {};
window.gl.MergeRequestWidgetStore = MergeRequestWidgetStore;
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