Merge branch 'sidebar-clipboard-toggle' into 'master'

Prevent toggling sidebar when clipboard icon clicked.

Prevents sidebar being toggle when copy to clipboard icon clicked.

Fixes #19399 

![sidebar-toggle](/uploads/e4e8dfe9ff2546464269242b5f3e34b1/sidebar-toggle.gif)

See merge request !5326
This commit is contained in:
Fatih Acet 2016-07-20 22:57:17 +00:00
commit 37f9a3117f
3 changed files with 5 additions and 1 deletions

View File

@ -142,6 +142,7 @@ v 8.10.0 (unreleased)
- Fix issues importing projects from EE to CE
- Fix creating group with space in group path
- Improve cron_jobs loading error messages !5318 / !5360
- Prevent toggling sidebar when clipboard icon clicked
- Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska)
- Limit the number of retries on error to 3 for exporting projects
- Allow empty repositories on project import/export

View File

@ -120,6 +120,9 @@ class @Sidebar
i.show()
sidebarCollapseClicked: (e) ->
return if $(e.currentTarget).hasClass('dont-change-state')
sidebar = e.data
e.preventDefault()
$block = $(@).closest('.block')

View File

@ -156,7 +156,7 @@
- project_ref = cross_project_reference(@project, issuable)
.block.project-reference
.sidebar-collapsed-icon
.sidebar-collapsed-icon.dont-change-state
= clipboard_button(clipboard_text: project_ref)
.cross-project-reference.hide-collapsed
%span