diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-14 16:14:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-14 16:14:56 +0000 |
| commit | ec5ba730e2c904a3e3aaf188a37322adac629998 (patch) | |
| tree | 1b10a2bac3d71c9ef8549f9a6ae06bebde867fad | |
| parent | e04aef5ccec442c18f3df90db270af26ec9a79f2 (diff) | |
| parent | 0636320ea67849023973a7eb12f566cefcf7e6ff (diff) | |
| download | gitlab-ce-ec5ba730e2c904a3e3aaf188a37322adac629998.tar.gz | |
Merge branch 'add-cookie-expirations-to-callouts' into 'master'
Add expirations to CA and user callouts
Closes #30267
See merge request !10568
| -rw-r--r-- | app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/user_callout.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js index b099b39e58f..48cab437e02 100644 --- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js +++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js @@ -125,7 +125,7 @@ $(() => { }, dismissOverviewDialog() { this.isOverviewDialogDismissed = true; - Cookies.set(OVERVIEW_DIALOG_COOKIE, '1'); + Cookies.set(OVERVIEW_DIALOG_COOKIE, '1', { expires: 365 }); }, }, }); diff --git a/app/assets/javascripts/user_callout.js b/app/assets/javascripts/user_callout.js index fa078b48bf8..b9d57cbcad4 100644 --- a/app/assets/javascripts/user_callout.js +++ b/app/assets/javascripts/user_callout.js @@ -18,7 +18,7 @@ export default class UserCallout { dismissCallout(e) { const $currentTarget = $(e.currentTarget); - Cookies.set(USER_CALLOUT_COOKIE, 'true'); + Cookies.set(USER_CALLOUT_COOKIE, 'true', { expires: 365 }); if ($currentTarget.hasClass('close')) { this.userCalloutBody.remove(); |