Merge branch 'master' into ide

* master: (86 commits)
  Show all labels
  33874 confidential issue redesign
  Exclude merge_jid on Import/Export attribute configuration
  Resolve "User dropdown in filtered search does not load avatar on `master`"
  Re-add column locked_at on migration rollback
  Group-level new issue & MR using previously selected project
  [EE Backport] Update log audit event in omniauth_callbacks_controller.rb
  more eagerly bail when the state is prevented
  Move locked_at removal to post-deployment migration
  Add class to other sidebars
  Improve mobile sidebar
  reduce iterations by keeping a count of remaining enablers
  Store & use ConvDev percentages returned by Version app
  Store MergeWorker JID on merge request, and clean up stuck merges
  Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
  DRY up caching in AbstractReferenceFilter
  Update CHANGELOG
  Add CHANGELOG entry
  Fix html structure Removes test for removed behavior
  Port form back to use form_tag
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 22f637946d9..bcee81bdc15 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -306,6 +306,10 @@ module ApplicationHelper
     cookies["new_nav"] == "true"
   end
 
+  def collapsed_sidebar?
+    cookies["sidebar_collapsed"] == "true"
+  end
+
   def show_new_repo?
     cookies["new_repo"] == "true" && body_data_page != 'projects:show'
   end