diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-30 14:39:07 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-30 14:39:07 +0000 |
| commit | 73196fbd65f414c051ece96bad7fb7042d3cf5b1 (patch) | |
| tree | 3b5d84e1da37840e09d61e438b0da86b35577672 /app | |
| parent | 99e5ae10bebfcb8e26117426bb773fcd531c45f1 (diff) | |
| parent | bf970141a165f3379c1623eb1deece26207a6134 (diff) | |
| download | gitlab-ce-73196fbd65f414c051ece96bad7fb7042d3cf5b1.tar.gz | |
Merge branch 'pin-nav-cookie-expiry' into 'master'
Expiry date on pinned nav cookie
## What does this MR do?
Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.
See merge request !5009
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index f936b6116cd..05080d50ce7 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -270,7 +270,7 @@ $ -> # Sidenav pinning if $window.width() < 1280 and $.cookie('pin_nav') is 'true' - $.cookie('pin_nav', 'false', { path: '/' }) + $.cookie('pin_nav', 'false', { path: '/', expires: 365 * 10 }) $('.page-with-sidebar') .toggleClass('page-sidebar-collapsed page-sidebar-expanded') .removeClass('page-sidebar-pinned') @@ -301,7 +301,7 @@ $ -> .toggleClass('header-collapsed header-expanded') # Save settings - $.cookie 'pin_nav', doPinNav, { path: '/' } + $.cookie 'pin_nav', doPinNav, { path: '/', expires: 365 * 10 } if $.cookie('pin_nav') is 'true' or doPinNav tooltipText = 'Unpin navigation' |