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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
11785719
Commit
11785719
authored
Nov 22, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use btn-primary for running builds btn
parent
e4c282c0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/merge_request_widget.js.es6
app/assets/javascripts/merge_request_widget.js.es6
+3
-3
No files found.
app/assets/javascripts/merge_request_widget.js.es6
View file @
11785719
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
MergeRequestWidget.prototype.addEventListeners = function() {
MergeRequestWidget.prototype.addEventListeners = function() {
var allowedPages;
var allowedPages;
allowedPages = ['show', 'commits', 'builds', 'pipelines', 'changes'];
allowedPages = ['show', 'commits', 'builds', 'pipelines', 'changes'];
return
$(document).on('page:change.merge_request', (function(_this) {
$(document).on('page:change.merge_request', (function(_this) {
return function() {
return function() {
var page;
var page;
page = $('body').data('page').split(':').last();
page = $('body').data('page').split(':').last();
...
@@ -245,7 +245,7 @@
...
@@ -245,7 +245,7 @@
case "not_found":
case "not_found":
return this.setMergeButtonClass('btn-danger');
return this.setMergeButtonClass('btn-danger');
case "running":
case "running":
return this.setMergeButtonClass('btn-
warning
');
return this.setMergeButtonClass('btn-
info
');
case "success":
case "success":
case "success_with_warnings":
case "success_with_warnings":
return this.setMergeButtonClass('btn-create');
return this.setMergeButtonClass('btn-create');
...
@@ -263,7 +263,7 @@
...
@@ -263,7 +263,7 @@
};
};
MergeRequestWidget.prototype.setMergeButtonClass = function(css_class) {
MergeRequestWidget.prototype.setMergeButtonClass = function(css_class) {
return $('.js-merge-button,.accept-action .dropdown-toggle').removeClass('btn-danger btn-
warning
btn-create').addClass(css_class);
return $('.js-merge-button,.accept-action .dropdown-toggle').removeClass('btn-danger btn-
info
btn-create').addClass(css_class);
};
};
return MergeRequestWidget;
return MergeRequestWidget;
...
...
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