BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
19ff8177
Commit
19ff8177
authored
Feb 20, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '28295-mr-loading-icon' into 'master'
fix MR jobs loading icon visibility Closes #28295 See merge request !9324
parents
4f405608
229f8068
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
merge_request_widget.js.es6
app/assets/javascripts/merge_request_widget.js.es6
+0
-1
mini_pipeline_graph_dropdown.js.es6
app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6
+1
-1
No files found.
app/assets/javascripts/merge_request_widget.js.es6
View file @
19ff8177
...
@@ -252,7 +252,6 @@ require('./smart_interval');
...
@@ -252,7 +252,6 @@ require('./smart_interval');
$('.ci_widget.ci-error').show();
$('.ci_widget.ci-error').show();
this.setMergeButtonClass('btn-danger');
this.setMergeButtonClass('btn-danger');
}
}
this.initMiniPipelineGraph();
};
};
MergeRequestWidget.prototype.showCICoverage = function(coverage) {
MergeRequestWidget.prototype.showCICoverage = function(coverage) {
...
...
app/assets/javascripts/mini_pipeline_graph_dropdown.js.es6
View file @
19ff8177
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
* All dropdown events are fired at the .dropdown-menu's parent element.
* All dropdown events are fired at the .dropdown-menu's parent element.
*/
*/
bindEvents() {
bindEvents() {
$(document).on('shown.bs.dropdown', this.container, this.getBuildsList);
$(document).o
ff('shown.bs.dropdown', this.container).o
n('shown.bs.dropdown', this.container, this.getBuildsList);
}
}
/**
/**
...
...
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