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
5463ee66
Commit
5463ee66
authored
Dec 15, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove builds from merge request tabs file
parent
bb992afe
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
443 deletions
+3
-443
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+0
-416
app/assets/javascripts/merge_request_tabs.js.es6
app/assets/javascripts/merge_request_tabs.js.es6
+3
-26
app/assets/javascripts/merge_request_widget.js.es6
app/assets/javascripts/merge_request_widget.js.es6
+0
-1
No files found.
app/assets/javascripts/merge_request_tabs.js
deleted
100644 → 0
View file @
bb992afe
This diff is collapsed.
Click to expand it.
app/assets/javascripts/merge_request_tabs.js.es6
View file @
5463ee66
...
@@ -59,16 +59,13 @@
...
@@ -59,16 +59,13 @@
class MergeRequestTabs {
class MergeRequestTabs {
constructor({ action, setUrl,
buildsLoaded,
stubLocation } = {}) {
constructor({ action, setUrl, stubLocation } = {}) {
this.diffsLoaded = false;
this.diffsLoaded = false;
this.buildsLoaded = false;
this.pipelinesLoaded = false;
this.pipelinesLoaded = false;
this.commitsLoaded = false;
this.commitsLoaded = false;
this.fixedLayoutPref = null;
this.fixedLayoutPref = null;
this.setUrl = setUrl !== undefined ? setUrl : true;
this.setUrl = setUrl !== undefined ? setUrl : true;
this.buildsLoaded = buildsLoaded || false;
this.setCurrentAction = this.setCurrentAction.bind(this);
this.setCurrentAction = this.setCurrentAction.bind(this);
this.tabShown = this.tabShown.bind(this);
this.tabShown = this.tabShown.bind(this);
this.showTab = this.showTab.bind(this);
this.showTab = this.showTab.bind(this);
...
@@ -119,10 +116,6 @@
...
@@ -119,10 +116,6 @@
$.scrollTo('.merge-request-details .merge-request-tabs', {
$.scrollTo('.merge-request-details .merge-request-tabs', {
offset: -navBarHeight,
offset: -navBarHeight,
});
});
} else if (action === 'builds') {
this.loadBuilds($target.attr('href'));
this.expandView();
this.resetViewContainer();
} else if (action === 'pipelines') {
} else if (action === 'pipelines') {
this.loadPipelines($target.attr('href'));
this.loadPipelines($target.attr('href'));
this.expandView();
this.expandView();
...
@@ -180,8 +173,8 @@
...
@@ -180,8 +173,8 @@
setCurrentAction(action) {
setCurrentAction(action) {
this.currentAction = action === 'show' ? 'notes' : action;
this.currentAction = action === 'show' ? 'notes' : action;
// Remove a trailing '/commits' '/diffs' '/
builds' '/
pipelines' '/new' '/new/diffs'
// Remove a trailing '/commits' '/diffs' '/pipelines' '/new' '/new/diffs'
let newState = location.pathname.replace(/\/(commits|diffs|
builds|
pipelines|new|new\/diffs)(\.html)?\/?$/, '');
let newState = location.pathname.replace(/\/(commits|diffs|pipelines|new|new\/diffs)(\.html)?\/?$/, '');
// Append the new action if we're on a tab other than 'notes'
// Append the new action if we're on a tab other than 'notes'
if (this.currentAction !== 'notes') {
if (this.currentAction !== 'notes') {
...
@@ -255,22 +248,6 @@
...
@@ -255,22 +248,6 @@
});
});
}
}
loadBuilds(source) {
if (this.buildsLoaded) {
return;
}
this.ajaxGet({
url: `${source}.json`,
success: (data) => {
document.querySelector('div#builds').innerHTML = data.html;
gl.utils.localTimeAgo($('.js-timeago', 'div#builds'));
this.buildsLoaded = true;
new gl.Pipelines();
this.scrollToElement('#builds');
},
});
}
loadPipelines(source) {
loadPipelines(source) {
if (this.pipelinesLoaded) {
if (this.pipelinesLoaded) {
return;
return;
...
...
app/assets/javascripts/merge_request_widget.js.es6
View file @
5463ee66
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
$('#modal_merge_info').modal({
$('#modal_merge_info').modal({
show: false
show: false
});
});
this.clearEventListeners();
this.clearEventListeners();
this.addEventListeners();
this.addEventListeners();
this.getCIStatus(false);
this.getCIStatus(false);
...
...
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