Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d3ff8c1a
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,发现更多精彩内容 >>
提交
d3ff8c1a
编写于
6月 20, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make default value for otp_required_for_login false instead of null
上级
8304bed1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
8 deletion
+17
-8
app/models/user.rb
app/models/user.rb
+4
-4
db/migrate/20150620233230_add_default_otp_required_for_login_value.rb
...0150620233230_add_default_otp_required_for_login_value.rb
+9
-0
db/schema.rb
db/schema.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-2
未找到文件。
app/models/user.rb
浏览文件 @
d3ff8c1a
...
@@ -50,12 +50,12 @@
...
@@ -50,12 +50,12 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_required_for_login :boolean
default(FALSE), not null
# otp_backup_codes :text
# otp_backup_codes :text
# public_email :string(255) default(""), not null
# dashboard :integer default(0)
# dashboard :integer default(0)
#
#
...
@@ -198,8 +198,8 @@ class User < ActiveRecord::Base
...
@@ -198,8 +198,8 @@ class User < ActiveRecord::Base
scope
:active
,
->
{
with_state
(
:active
)
}
scope
:active
,
->
{
with_state
(
:active
)
}
scope
:not_in_project
,
->
(
project
)
{
project
.
users
.
present?
?
where
(
"id not in (:ids)"
,
ids:
project
.
users
.
map
(
&
:id
)
)
:
all
}
scope
:not_in_project
,
->
(
project
)
{
project
.
users
.
present?
?
where
(
"id not in (:ids)"
,
ids:
project
.
users
.
map
(
&
:id
)
)
:
all
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM members)'
)
}
scope
:without_projects
,
->
{
where
(
'id NOT IN (SELECT DISTINCT(user_id) FROM members)'
)
}
scope
:with_two_factor
,
->
{
where
(
'otp_required_for_login IS true'
)
}
scope
:with_two_factor
,
->
{
where
(
otp_required_for_login:
true
)
}
scope
:without_two_factor
,
->
{
where
(
'otp_required_for_login IS NOT true'
)
}
scope
:without_two_factor
,
->
{
where
(
otp_required_for_login:
false
)
}
#
#
# Class methods
# Class methods
...
...
db/migrate/20150620233230_add_default_otp_required_for_login_value.rb
0 → 100644
浏览文件 @
d3ff8c1a
class
AddDefaultOtpRequiredForLoginValue
<
ActiveRecord
::
Migration
def
up
change_column
:users
,
:otp_required_for_login
,
:boolean
,
default:
false
,
null:
false
end
def
down
change_column
:users
,
:otp_required_for_login
,
:boolean
,
default:
nil
end
end
db/schema.rb
浏览文件 @
d3ff8c1a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201506
10065936
)
do
ActiveRecord
::
Schema
.
define
(
version:
201506
20233230
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
@@ -499,7 +499,7 @@ ActiveRecord::Schema.define(version: 20150610065936) do
...
@@ -499,7 +499,7 @@ ActiveRecord::Schema.define(version: 20150610065936) do
t
.
string
"encrypted_otp_secret"
t
.
string
"encrypted_otp_secret"
t
.
string
"encrypted_otp_secret_iv"
t
.
string
"encrypted_otp_secret_iv"
t
.
string
"encrypted_otp_secret_salt"
t
.
string
"encrypted_otp_secret_salt"
t
.
boolean
"otp_required_for_login"
t
.
boolean
"otp_required_for_login"
,
default:
false
,
null:
false
t
.
text
"otp_backup_codes"
t
.
text
"otp_backup_codes"
t
.
string
"public_email"
,
default:
""
,
null:
false
t
.
string
"public_email"
,
default:
""
,
null:
false
t
.
integer
"dashboard"
,
default:
0
t
.
integer
"dashboard"
,
default:
0
...
...
spec/models/user_spec.rb
浏览文件 @
d3ff8c1a
...
@@ -50,12 +50,12 @@
...
@@ -50,12 +50,12 @@
# bitbucket_access_token :string(255)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
# encrypted_otp_secret :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_iv :string(255)
# encrypted_otp_secret_salt :string(255)
# encrypted_otp_secret_salt :string(255)
# otp_required_for_login :boolean
# otp_required_for_login :boolean
default(FALSE), not null
# otp_backup_codes :text
# otp_backup_codes :text
# public_email :string(255) default(""), not null
# dashboard :integer default(0)
# dashboard :integer default(0)
#
#
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录