diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-24 14:56:36 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-24 14:56:36 +0000 |
| commit | 35f8136479ce7d5c9d55a27243457ed6ea7ddbda (patch) | |
| tree | aeb96d76e9b71ee4c9471c7bf117523562a6ebc3 /app/views/shared | |
| parent | 76c6aa8b6a36996a42ba5b2024adbb292e35bbbd (diff) | |
| parent | ba6864343b776251a70378295242dd2e41e13de0 (diff) | |
| download | gitlab-ce-35f8136479ce7d5c9d55a27243457ed6ea7ddbda.tar.gz | |
Merge branch '29880-refactor-sidebar-hacks' into 'master'
Resolve "Move sub_nav content above the content-wrapper class"
Closes #29880
See merge request !10163
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 25a4aec0a38..884bd3ca9ca 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -3,7 +3,7 @@ = page_specific_javascript_bundle_tag('common_vue') = page_specific_javascript_bundle_tag('issuable') -%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } +%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "102", "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } .issuable-sidebar - can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .block.issuable-sidebar-header |