Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
269594bf
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
269594bf
编写于
1月 01, 2018
作者:
J
Jacopo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Shows signin tab after new user email confirmation
When a new user confirm his email the signin tab is correctly shown.
上级
50a64953
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
5 deletion
+19
-5
app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
...ts/javascripts/pages/sessions/new/signin_tabs_memoizer.js
+4
-2
app/controllers/confirmations_controller.rb
app/controllers/confirmations_controller.rb
+1
-1
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+1
-1
app/views/devise/shared/_tabs_ldap.html.haml
app/views/devise/shared/_tabs_ldap.html.haml
+1
-1
changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml
...eased/41206-show-signin-pane-after-email-confirmation.yml
+5
-0
spec/javascripts/signin_tabs_memoizer_spec.js
spec/javascripts/signin_tabs_memoizer_spec.js
+7
-0
未找到文件。
app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
浏览文件 @
269594bf
/* 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
();
}
...
...
app/controllers/confirmations_controller.rb
浏览文件 @
269594bf
...
...
@@ -17,7 +17,7 @@ class ConfirmationsController < Devise::ConfirmationsController
else
Gitlab
::
AppLogger
.
info
(
"Email Confirmed: username=
#{
resource
.
username
}
email=
#{
resource
.
email
}
ip=
#{
request
.
remote_ip
}
"
)
flash
[
:notice
]
+=
" Please sign in."
new_session_path
(
:user
)
new_session_path
(
:user
,
anchor:
'login-pane'
)
end
end
...
...
app/views/devise/shared/_signin_box.html.haml
浏览文件 @
269594bf
...
...
@@ -8,7 +8,7 @@
.login-body
=
render
'devise/sessions/new_ldap'
,
server:
server
-
if
password_authentication_enabled_for_web?
.login-box.tab-pane
{
id:
'l
dap-standard
'
,
role:
'tabpanel'
}
.login-box.tab-pane
{
id:
'l
ogin-pane
'
,
role:
'tabpanel'
}
.login-body
=
render
'devise/sessions/new_base'
...
...
app/views/devise/shared/_tabs_ldap.html.haml
浏览文件 @
269594bf
...
...
@@ -7,7 +7,7 @@
=
link_to
server
[
'label'
],
"#
#{
server
[
'provider_name'
]
}
"
,
'data-toggle'
=>
'tab'
-
if
password_authentication_enabled_for_web?
%li
=
link_to
'Standard'
,
'#l
dap-standard
'
,
'data-toggle'
=>
'tab'
=
link_to
'Standard'
,
'#l
ogin-pane
'
,
'data-toggle'
=>
'tab'
-
if
allow_signup?
%li
=
link_to
'Register'
,
'#register-pane'
,
'data-toggle'
=>
'tab'
changelogs/unreleased/41206-show-signin-pane-after-email-confirmation.yml
0 → 100644
浏览文件 @
269594bf
---
title
:
Shows signin tab after new user email confirmation
merge_request
:
16174
author
:
Jacopo Beschi @jacopo-beschi
type
:
fixed
spec/javascripts/signin_tabs_memoizer_spec.js
浏览文件 @
269594bf
...
...
@@ -53,6 +53,13 @@ import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer';
expect
(
memo
.
readData
()).
toEqual
(
'
#standard
'
);
});
it
(
'
overrides last selected tab with hash tag when given
'
,
()
=>
{
window
.
location
.
hash
=
'
#ldap
'
;
createMemoizer
();
expect
(
memo
.
readData
()).
toEqual
(
'
#ldap
'
);
});
describe
(
'
class constructor
'
,
()
=>
{
beforeEach
(()
=>
{
memo
=
createMemoizer
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录