Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b8433cb8
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,发现更多精彩内容 >>
提交
b8433cb8
编写于
8月 02, 2015
作者:
S
Stan Hu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:gitlabhq/gitlabhq
上级
688ee3e4
ef707ebf
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
43 addition
and
6 deletion
+43
-6
app/models/application_setting.rb
app/models/application_setting.rb
+3
-2
app/models/audit_event.rb
app/models/audit_event.rb
+14
-0
app/models/project.rb
app/models/project.rb
+2
-1
app/models/security_event.rb
app/models/security_event.rb
+14
-0
app/models/user.rb
app/models/user.rb
+1
-0
spec/factories/projects.rb
spec/factories/projects.rb
+2
-1
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+4
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+2
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-0
未找到文件。
app/models/application_setting.rb
浏览文件 @
b8433cb8
...
...
@@ -14,13 +14,14 @@
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
# restricted_visibility_levels :text
# version_check_enabled :boolean default(TRUE)
# max_attachment_size :integer default(10), not null
# session_expire_delay :integer default(10080), not null
# default_project_visibility :integer
# default_snippet_visibility :integer
# restricted_signup_domains :text
# user_oauth_applications :bool
default(TRUE)
# user_oauth_applications :bool
ean
default(TRUE)
# after_sign_out_path :string(255)
# session_expire_delay :integer default(10080), not null
#
class
ApplicationSetting
<
ActiveRecord
::
Base
...
...
app/models/audit_event.rb
浏览文件 @
b8433cb8
# == Schema Information
#
# Table name: audit_events
#
# id :integer not null, primary key
# author_id :integer not null
# type :string(255) not null
# entity_id :integer not null
# entity_type :string(255) not null
# details :text
# created_at :datetime
# updated_at :datetime
#
class
AuditEvent
<
ActiveRecord
::
Base
serialize
:details
,
Hash
...
...
app/models/project.rb
浏览文件 @
b8433cb8
...
...
@@ -21,12 +21,13 @@
# import_url :string(255)
# visibility_level :integer default(0), not null
# archived :boolean default(FALSE), not null
# avatar :string(255)
# import_status :string(255)
# repository_size :float default(0.0)
# star_count :integer default(0), not null
# import_type :string(255)
# import_source :string(255)
#
avatar :string(255
)
#
commit_count :integer default(0
)
#
require
'carrierwave/orm/activerecord'
...
...
app/models/security_event.rb
浏览文件 @
b8433cb8
# == Schema Information
#
# Table name: audit_events
#
# id :integer not null, primary key
# author_id :integer not null
# type :string(255) not null
# entity_id :integer not null
# entity_type :string(255) not null
# details :text
# created_at :datetime
# updated_at :datetime
#
class
SecurityEvent
<
AuditEvent
end
app/models/user.rb
浏览文件 @
b8433cb8
...
...
@@ -57,6 +57,7 @@
# otp_backup_codes :text
# public_email :string(255) default(""), not null
# dashboard :integer default(0)
# project_view :integer default(0)
#
require
'carrierwave/orm/activerecord'
...
...
spec/factories/projects.rb
浏览文件 @
b8433cb8
...
...
@@ -21,12 +21,13 @@
# import_url :string(255)
# visibility_level :integer default(0), not null
# archived :boolean default(FALSE), not null
# avatar :string(255)
# import_status :string(255)
# repository_size :float default(0.0)
# star_count :integer default(0), not null
# import_type :string(255)
# import_source :string(255)
#
avatar :string(255
)
#
commit_count :integer default(0
)
#
FactoryGirl
.
define
do
...
...
spec/models/application_setting_spec.rb
浏览文件 @
b8433cb8
...
...
@@ -14,11 +14,14 @@
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
# restricted_visibility_levels :text
# version_check_enabled :boolean default(TRUE)
# max_attachment_size :integer default(10), not null
# session_expire_delay :integer default(10080), not null
# default_project_visibility :integer
# default_snippet_visibility :integer
# restricted_signup_domains :text
# user_oauth_applications :boolean default(TRUE)
# after_sign_out_path :string(255)
# session_expire_delay :integer default(10080), not null
#
require
'spec_helper'
...
...
spec/models/project_spec.rb
浏览文件 @
b8433cb8
...
...
@@ -21,12 +21,13 @@
# import_url :string(255)
# visibility_level :integer default(0), not null
# archived :boolean default(FALSE), not null
# avatar :string(255)
# import_status :string(255)
# repository_size :float default(0.0)
# star_count :integer default(0), not null
# import_type :string(255)
# import_source :string(255)
#
avatar :string(255
)
#
commit_count :integer default(0
)
#
require
'spec_helper'
...
...
spec/models/user_spec.rb
浏览文件 @
b8433cb8
...
...
@@ -57,6 +57,7 @@
# otp_backup_codes :text
# public_email :string(255) default(""), not null
# dashboard :integer default(0)
# project_view :integer default(0)
#
require
'spec_helper'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录