summaryrefslogtreecommitdiff
path: root/spec/javascripts/fixtures
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-25 21:00:16 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-25 21:00:16 +0000
commit98f77d2edcfba7783174cd0010a9c9b7fa44aaa5 (patch)
tree69890e6dfb234f9d0934c7457ba706c887b60cac /spec/javascripts/fixtures
parentfd231ff9fb6292c2fd15f71c5329216e67935560 (diff)
parent00e967a07f476f7df7aaddc652258668af392f5d (diff)
downloadgitlab-ce-98f77d2edcfba7783174cd0010a9c9b7fa44aaa5.tar.gz
Merge branch 'close-open-ajax-issue' into 'master'
open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
Diffstat (limited to 'spec/javascripts/fixtures')
-rw-r--r--spec/javascripts/fixtures/issues_show.html.haml12
1 files changed, 11 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/issues_show.html.haml b/spec/javascripts/fixtures/issues_show.html.haml
index 8447dfdda32..470cabeafbb 100644
--- a/spec/javascripts/fixtures/issues_show.html.haml
+++ b/spec/javascripts/fixtures/issues_show.html.haml
@@ -1,4 +1,14 @@
-%a.btn-close
+:css
+ .hidden { display: none !important; }
+
+.flash-container
+ .flash-alert
+ .flash-notice
+
+.status-box.status-box-open Open
+.status-box.status-box-closed.hidden Closed
+%a.btn-close{"href" => "http://gitlab.com/issues/6/close"} Close
+%a.btn-reopen.hidden{"href" => "http://gitlab.com/issues/6/reopen"} Reopen
.detail-page-description
.description.js-task-list-container