diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-08-17 19:03:27 +0000 |
| commit | b8485707f268e95b28ef051cc5a4250df22cd13b (patch) | |
| tree | 882a11d3ac70c1eb3762ce8ee55866fdef438640 /app/views/shared/milestones/_sidebar.html.haml | |
| parent | ab6bf68c4ed62a487fa7e6390462c32bf836c8d6 (diff) | |
| parent | f0ac0daf6a8788f57b98eaf29b0056899027ae68 (diff) | |
| download | gitlab-ce-docs-article-undo-things-in-git.tar.gz | |
Fix conflictdocs-article-undo-things-in-git
Merge branch 'master' into 'docs-article-undo-things-in-git'
# Conflicts:
# doc/articles/index.md
Diffstat (limited to 'app/views/shared/milestones/_sidebar.html.haml')
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 66ac8196f2f..40379f48393 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -1,7 +1,7 @@ - affix_offset = local_assigns.fetch(:affix_offset, "50") - project = local_assigns[:project] -%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } +%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } .issuable-sidebar.milestone-sidebar .block.milestone-progress.issuable-sidebar-header %a.gutter-toggle.pull-right.js-sidebar-toggle{ role: "button", href: "#", "aria-label" => "Toggle sidebar" } |