summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-29 15:18:24 +0000
committerValery Sizov <valery@gitlab.com>2015-06-29 15:18:24 +0000
commit4dcfbe5f5d1cce0e5cbd943e69f46d39a591ba3d (patch)
tree9a26ae20ac063fd1a3ad089eae2156f3617176b3
parent6c2922c6b031e39ad8b23d71f61edc20094ce976 (diff)
parentf2331e53de2cb98475e3306052dcdf3b2db2f430 (diff)
downloadgitlab-ci-4dcfbe5f5d1cce0e5cbd943e69f46d39a591ba3d.tar.gz
Merge branch 'status_badge' into 'master'
Build status Badge: unable to obtain code https://dev.gitlab.org/gitlab/gitlab-ci/issues/304 See merge request !177
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/javascripts/projects.js.coffee3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 577ed36..7f22c49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v7.12.1
- Add warning when .gitlab-ci.yml not found
- Improved validation for .gitlab-ci.yml
- Fix list of branches in only section
+ - Fix "Status Badge" button
v7.12.0
- Endless scroll on the dashboard
diff --git a/app/assets/javascripts/projects.js.coffee b/app/assets/javascripts/projects.js.coffee
index 4ad500c..ec962c9 100644
--- a/app/assets/javascripts/projects.js.coffee
+++ b/app/assets/javascripts/projects.js.coffee
@@ -1,5 +1,6 @@
$(document).on 'click', '.badge-codes-toggle', ->
- $('.badge-codes-block').toggle()
+ $('.badge-codes-block').toggleClass("hide")
+ return false
$(document).on 'click', '.sync-now', ->
$(this).find('i').addClass('icon-spin')