diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-01 21:03:18 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-01 21:03:18 +0000 |
| commit | 1646b81e2a4aa94c82a669b135f875713450eacc (patch) | |
| tree | 51a6b4d170ca7ce67e015f488df524e7cb478172 /spec/javascripts/fixtures | |
| parent | 4d37be0fb874998325d2785e6934fd87a117c806 (diff) | |
| parent | bc1b305dcfff3c4818e6e3d1315234db9a555d61 (diff) | |
| download | gitlab-ce-1646b81e2a4aa94c82a669b135f875713450eacc.tar.gz | |
Merge branch 'right-sidebar-fixture' into 'master'
Replace static fixture for right_sidebar_spec
## What does this MR do?
Replace `right_sidebar.html.haml` for `right_sidebar_spec.js` by already existing dynamically generated fixture.
## What are the relevant issue numbers?
#24753
See merge request !7687
Diffstat (limited to 'spec/javascripts/fixtures')
| -rw-r--r-- | spec/javascripts/fixtures/right_sidebar.html.haml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/spec/javascripts/fixtures/right_sidebar.html.haml b/spec/javascripts/fixtures/right_sidebar.html.haml deleted file mode 100644 index d259b58f235..00000000000 --- a/spec/javascripts/fixtures/right_sidebar.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -%div - %div.page-gutter.page-with-sidebar - - %aside.right-sidebar - %div.block.issuable-sidebar-header - %a.gutter-toggle.pull-right.js-sidebar-toggle - %i.fa.fa-angle-double-left - %button.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo{ type: "button", data: { todo_text: "Add todo", mark_text: "Mark done", issuable_id: "1", issuable_type: "issue", url: "/todos" }} - %span.js-issuable-todo-text - Add todo - %i.fa.fa-spin.fa-spinner.js-issuable-todo-loading.hidden - - %form.issuable-context-form - %div.block.labels - %div.sidebar-collapsed-icon - %i.fa.fa-tags - %span 1 |