Commit 37f9a311 authored by Fatih Acet's avatar Fatih Acet

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
parents 9de37726 3e24a102
No related merge requests found
...@@ -142,6 +142,7 @@ v 8.10.0 (unreleased) ...@@ -142,6 +142,7 @@ v 8.10.0 (unreleased)
- Fix issues importing projects from EE to CE - Fix issues importing projects from EE to CE
- Fix creating group with space in group path - Fix creating group with space in group path
- Improve cron_jobs loading error messages !5318 / !5360 - 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) - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska)
- Limit the number of retries on error to 3 for exporting projects - Limit the number of retries on error to 3 for exporting projects
- Allow empty repositories on project import/export - Allow empty repositories on project import/export
......
...@@ -120,6 +120,9 @@ class @Sidebar ...@@ -120,6 +120,9 @@ class @Sidebar
i.show() i.show()
sidebarCollapseClicked: (e) -> sidebarCollapseClicked: (e) ->
return if $(e.currentTarget).hasClass('dont-change-state')
sidebar = e.data sidebar = e.data
e.preventDefault() e.preventDefault()
$block = $(@).closest('.block') $block = $(@).closest('.block')
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
- project_ref = cross_project_reference(@project, issuable) - project_ref = cross_project_reference(@project, issuable)
.block.project-reference .block.project-reference
.sidebar-collapsed-icon .sidebar-collapsed-icon.dont-change-state
= clipboard_button(clipboard_text: project_ref) = clipboard_button(clipboard_text: project_ref)
.cross-project-reference.hide-collapsed .cross-project-reference.hide-collapsed
%span %span
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment