Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1e7116b3
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,体验更适合开发者的 AI 搜索 >>
提交
1e7116b3
编写于
3月 29, 2016
作者:
Z
Zeger-Jan van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Exclude projects pending deletion from all results
上级
95c7aa62
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
33 addition
and
12 deletion
+33
-12
CHANGELOG
CHANGELOG
+1
-0
app/models/project.rb
app/models/project.rb
+2
-0
app/services/system_hooks_service.rb
app/services/system_hooks_service.rb
+12
-10
app/workers/project_destroy_worker.rb
app/workers/project_destroy_worker.rb
+1
-1
db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
...te/20160329144452_add_index_on_pending_delete_projects.rb
+6
-0
db/schema.rb
db/schema.rb
+2
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+9
-0
未找到文件。
CHANGELOG
浏览文件 @
1e7116b3
...
@@ -10,6 +10,7 @@ v 8.7.0 (unreleased)
...
@@ -10,6 +10,7 @@ v 8.7.0 (unreleased)
- Fix raw/rendered diff producing different results on merge requests !3450
- Fix raw/rendered diff producing different results on merge requests !3450
- Add links to CI setup documentation from project settings and builds pages
- Add links to CI setup documentation from project settings and builds pages
- Handle nil descriptions in Slack issue messages (Stan Hu)
- Handle nil descriptions in Slack issue messages (Stan Hu)
- Add default scope to projects to exclude projects pending deletion
- Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
- Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
- Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
- Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
- Gracefully handle notes on deleted commits in merge requests (Stan Hu)
- Gracefully handle notes on deleted commits in merge requests (Stan Hu)
...
...
app/models/project.rb
浏览文件 @
1e7116b3
...
@@ -206,6 +206,8 @@ class Project < ActiveRecord::Base
...
@@ -206,6 +206,8 @@ class Project < ActiveRecord::Base
mount_uploader
:avatar
,
AvatarUploader
mount_uploader
:avatar
,
AvatarUploader
# Scopes
# Scopes
default_scope
{
where
(
pending_delete:
false
)
}
scope
:sorted_by_activity
,
->
{
reorder
(
last_activity_at: :desc
)
}
scope
:sorted_by_activity
,
->
{
reorder
(
last_activity_at: :desc
)
}
scope
:sorted_by_stars
,
->
{
reorder
(
'projects.star_count DESC'
)
}
scope
:sorted_by_stars
,
->
{
reorder
(
'projects.star_count DESC'
)
}
scope
:sorted_by_names
,
->
{
joins
(
:namespace
).
reorder
(
'namespaces.name ASC, projects.name ASC'
)
}
scope
:sorted_by_names
,
->
{
joins
(
:namespace
).
reorder
(
'namespaces.name ASC, projects.name ASC'
)
}
...
...
app/services/system_hooks_service.rb
浏览文件 @
1e7116b3
...
@@ -95,17 +95,19 @@ class SystemHooksService
...
@@ -95,17 +95,19 @@ class SystemHooksService
end
end
def
project_member_data
(
model
)
def
project_member_data
(
model
)
project
=
model
.
project
||
Project
.
unscoped
.
find
(
model
.
source_id
)
{
{
project_name:
model
.
project
.
name
,
project_name:
project
.
name
,
project_path:
model
.
project
.
path
,
project_path:
project
.
path
,
project_path_with_namespace:
model
.
project
.
path_with_namespace
,
project_path_with_namespace:
project
.
path_with_namespace
,
project_id:
model
.
project
.
id
,
project_id:
project
.
id
,
user_username:
model
.
user
.
username
,
user_username:
model
.
user
.
username
,
user_name:
model
.
user
.
name
,
user_name:
model
.
user
.
name
,
user_email:
model
.
user
.
email
,
user_email:
model
.
user
.
email
,
user_id:
model
.
user
.
id
,
user_id:
model
.
user
.
id
,
access_level:
model
.
human_access
,
access_level:
model
.
human_access
,
project_visibility:
Project
.
visibility_levels
.
key
(
model
.
project
.
visibility_level_field
).
downcase
project_visibility:
Project
.
visibility_levels
.
key
(
project
.
visibility_level_field
).
downcase
}
}
end
end
...
...
app/workers/project_destroy_worker.rb
浏览文件 @
1e7116b3
...
@@ -5,7 +5,7 @@ class ProjectDestroyWorker
...
@@ -5,7 +5,7 @@ class ProjectDestroyWorker
def
perform
(
project_id
,
user_id
,
params
)
def
perform
(
project_id
,
user_id
,
params
)
begin
begin
project
=
Project
.
find
(
project_id
)
project
=
Project
.
unscoped
.
find
(
project_id
)
rescue
ActiveRecord
::
RecordNotFound
rescue
ActiveRecord
::
RecordNotFound
return
return
end
end
...
...
db/migrate/20160329144452_add_index_on_pending_delete_projects.rb
0 → 100644
浏览文件 @
1e7116b3
class
AddIndexOnPendingDeleteProjects
<
ActiveRecord
::
Migration
def
change
add_index
:projects
,
:pending_delete
end
end
db/schema.rb
浏览文件 @
1e7116b3
...
@@ -745,6 +745,7 @@ ActiveRecord::Schema.define(version: 20160331133914) do
...
@@ -745,6 +745,7 @@ ActiveRecord::Schema.define(version: 20160331133914) do
add_index
"projects"
,
[
"namespace_id"
],
name:
"index_projects_on_namespace_id"
,
using: :btree
add_index
"projects"
,
[
"namespace_id"
],
name:
"index_projects_on_namespace_id"
,
using: :btree
add_index
"projects"
,
[
"path"
],
name:
"index_projects_on_path"
,
using: :btree
add_index
"projects"
,
[
"path"
],
name:
"index_projects_on_path"
,
using: :btree
add_index
"projects"
,
[
"path"
],
name:
"index_projects_on_path_trigram"
,
using: :gin
,
opclasses:
{
"path"
=>
"gin_trgm_ops"
}
add_index
"projects"
,
[
"path"
],
name:
"index_projects_on_path_trigram"
,
using: :gin
,
opclasses:
{
"path"
=>
"gin_trgm_ops"
}
add_index
"projects"
,
[
"pending_delete"
],
name:
"index_projects_on_pending_delete"
,
using: :btree
add_index
"projects"
,
[
"runners_token"
],
name:
"index_projects_on_runners_token"
,
using: :btree
add_index
"projects"
,
[
"runners_token"
],
name:
"index_projects_on_runners_token"
,
using: :btree
add_index
"projects"
,
[
"star_count"
],
name:
"index_projects_on_star_count"
,
using: :btree
add_index
"projects"
,
[
"star_count"
],
name:
"index_projects_on_star_count"
,
using: :btree
add_index
"projects"
,
[
"visibility_level"
],
name:
"index_projects_on_visibility_level"
,
using: :btree
add_index
"projects"
,
[
"visibility_level"
],
name:
"index_projects_on_visibility_level"
,
using: :btree
...
...
spec/models/project_spec.rb
浏览文件 @
1e7116b3
...
@@ -104,6 +104,15 @@ describe Project, models: true do
...
@@ -104,6 +104,15 @@ describe Project, models: true do
end
end
end
end
describe
'default_scope'
do
it
'excludes projects pending deletion from the results'
do
project
=
create
(
:empty_project
)
create
(
:empty_project
,
pending_delete:
true
)
expect
(
Project
.
all
).
to
eq
[
project
]
end
end
describe
'project token'
do
describe
'project token'
do
it
'should set an random token if none provided'
do
it
'should set an random token if none provided'
do
project
=
FactoryGirl
.
create
:empty_project
,
runners_token:
''
project
=
FactoryGirl
.
create
:empty_project
,
runners_token:
''
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录