summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-01-20 01:03:14 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-01-20 01:03:14 +0000
commit8d6b029e25ab07283be0bb25b0a1667df9207009 (patch)
tree73ae9ba16dd7e69c50f2ae539249916869ad9295 /app/assets
parent7fa0a3e7775703ad9e53216f6154a773ca17ad4a (diff)
parent269594bf2277e14d8cd189cdbbeeee7db8ed23d7 (diff)
downloadgitlab-ce-8d6b029e25ab07283be0bb25b0a1667df9207009.tar.gz
Merge branch '41206-show-signin-pane-after-email-confirmation' into 'master'
Resolve "New user is sent back to Register tab after confirming email" Closes #41206 See merge request gitlab-org/gitlab-ce!16174
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
index f99573e5c74..08f0afdcce3 100644
--- a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
+++ b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
@@ -1,5 +1,3 @@
-/* eslint no-param-reassign: ["error", { "props": false }]*/
-/* eslint no-new: "off" */
import AccessorUtilities from '~/lib/utils/accessor';
/**
@@ -11,6 +9,10 @@ export default class SigninTabsMemoizer {
this.currentTabKey = currentTabKey;
this.tabSelector = tabSelector;
this.isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
+ // sets selected tab if given as hash tag
+ if (window.location.hash) {
+ this.saveData(window.location.hash);
+ }
this.bootstrap();
}