Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ebb6393d
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 搜索 >>
提交
ebb6393d
编写于
7月 19, 2015
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Merge branch 'cache-improvement' into '7-13-stable'
This reverts commit
94c2516a
, reversing changes made to
ae44e5ec
.
上级
55b4f31d
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
23 addition
and
110 deletion
+23
-110
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+0
-14
app/models/project.rb
app/models/project.rb
+0
-4
app/models/repository.rb
app/models/repository.rb
+14
-21
app/services/git_push_service.rb
app/services/git_push_service.rb
+1
-1
app/services/git_tag_push_service.rb
app/services/git_tag_push_service.rb
+3
-3
app/views/explore/projects/_project.html.haml
app/views/explore/projects/_project.html.haml
+1
-1
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
app/workers/project_cache_worker.rb
app/workers/project_cache_worker.rb
+0
-15
app/workers/repository_import_worker.rb
app/workers/repository_import_worker.rb
+1
-1
db/fixtures/development/04_project.rb
db/fixtures/development/04_project.rb
+1
-34
db/migrate/20150717130904_add_commits_count_to_project.rb
db/migrate/20150717130904_add_commits_count_to_project.rb
+0
-5
db/schema.rb
db/schema.rb
+1
-2
lib/repository_cache.rb
lib/repository_cache.rb
+0
-8
未找到文件。
app/helpers/projects_helper.rb
浏览文件 @
ebb6393d
...
...
@@ -276,18 +276,4 @@ module ProjectsHelper
def
readme_cache_key
[
@project
.
id
,
@project
.
commit
.
sha
,
"readme"
].
join
(
'-'
)
end
def
round_commit_count
(
project
)
count
=
project
.
commit_count
if
count
>
10000
'10000+'
elsif
count
>
5000
'5000+'
elsif
count
>
1000
'1000+'
else
count
end
end
end
app/models/project.rb
浏览文件 @
ebb6393d
...
...
@@ -683,10 +683,6 @@ class Project < ActiveRecord::Base
update_attribute
(
:repository_size
,
repository
.
size
)
end
def
update_commit_count
update_attribute
(
:commit_count
,
repository
.
commit_count
)
end
def
forks_count
ForkedProjectLink
.
where
(
forked_from_project_id:
self
.
id
).
count
end
...
...
app/models/repository.rb
浏览文件 @
ebb6393d
...
...
@@ -94,6 +94,18 @@ class Repository
gitlab_shell
.
rm_tag
(
path_with_namespace
,
tag_name
)
end
def
round_commit_count
if
commit_count
>
10000
'10000+'
elsif
commit_count
>
5000
'5000+'
elsif
commit_count
>
1000
'1000+'
else
commit_count
end
end
def
branch_names
cache
.
fetch
(
:branch_names
)
{
raw_repository
.
branch_names
}
end
...
...
@@ -118,29 +130,10 @@ class Repository
cache
.
fetch
(
:size
)
{
raw_repository
.
size
}
end
def
cache_keys
%i(size branch_names tag_names commit_count graph_log
readme version contribution_guide changelog license)
end
def
build_cache
cache_keys
.
each
do
|
key
|
unless
cache
.
exist?
(
key
)
send
(
key
)
end
end
end
def
expire_cache
cache_keys
.
each
do
|
key
|
cache
.
expire
(
key
)
end
end
def
rebuild_cache
cache_keys
.
each
do
|
key
|
%i(size branch_names tag_names commit_count graph_log
readme version contribution_guide changelog license)
.
each
do
|
key
|
cache
.
expire
(
key
)
send
(
key
)
end
end
...
...
app/services/git_push_service.rb
浏览文件 @
ebb6393d
...
...
@@ -21,6 +21,7 @@ class GitPushService
project
.
ensure_satellite_exists
project
.
repository
.
expire_cache
project
.
update_repository_size
if
push_remove_branch?
(
ref
,
newrev
)
@push_commits
=
[]
...
...
@@ -60,7 +61,6 @@ class GitPushService
EventCreateService
.
new
.
push
(
project
,
user
,
@push_data
)
project
.
execute_hooks
(
@push_data
.
dup
,
:push_hooks
)
project
.
execute_services
(
@push_data
.
dup
,
:push_hooks
)
ProjectCacheWorker
.
perform_async
(
project
.
id
)
end
protected
...
...
app/services/git_tag_push_service.rb
浏览文件 @
ebb6393d
...
...
@@ -2,15 +2,15 @@ class GitTagPushService
attr_accessor
:project
,
:user
,
:push_data
def
execute
(
project
,
user
,
oldrev
,
newrev
,
ref
)
project
.
repository
.
expire_cache
@project
,
@user
=
project
,
user
@push_data
=
build_push_data
(
oldrev
,
newrev
,
ref
)
EventCreateService
.
new
.
push
(
project
,
user
,
@push_data
)
project
.
execute_hooks
(
@push_data
.
dup
,
:tag_push_hooks
)
project
.
execute_services
(
@push_data
.
dup
,
:tag_push_hooks
)
ProjectCacheWorker
.
perform_async
(
project
.
id
)
project
.
repository
.
expire_cache
true
end
...
...
app/views/explore/projects/_project.html.haml
浏览文件 @
ebb6393d
...
...
@@ -14,7 +14,7 @@
.repo-info
-
unless
project
.
empty_repo?
=
link_to
pluralize
(
round_commit_count
(
project
)
,
'commit'
),
namespace_project_commits_path
(
project
.
namespace
,
project
,
project
.
default_branch
)
=
link_to
pluralize
(
project
.
repository
.
round_commit_count
,
'commit'
),
namespace_project_commits_path
(
project
.
namespace
,
project
,
project
.
default_branch
)
·
=
link_to
pluralize
(
project
.
repository
.
branch_names
.
count
,
'branch'
),
namespace_project_branches_path
(
project
.
namespace
,
project
)
·
...
...
app/views/projects/show.html.haml
浏览文件 @
ebb6393d
...
...
@@ -13,7 +13,7 @@
%ul
.nav.nav-pills
%li
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
||
@repository
.
root_ref
)
do
=
pluralize
(
number_with_delimiter
(
@
project
.
commit_count
),
'commit'
)
=
pluralize
(
number_with_delimiter
(
@
repository
.
commit_count
),
'commit'
)
%li
=
link_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
)
do
=
pluralize
(
number_with_delimiter
(
@repository
.
branch_names
.
count
),
'branch'
)
...
...
app/workers/project_cache_worker.rb
已删除
100644 → 0
浏览文件 @
55b4f31d
class
ProjectCacheWorker
include
Sidekiq
::
Worker
sidekiq_options
queue: :default
def
perform
(
project_id
)
project
=
Project
.
find
(
project_id
)
project
.
update_repository_size
project
.
update_commit_count
if
project
.
repository
.
root_ref
project
.
repository
.
build_cache
end
end
end
app/workers/repository_import_worker.rb
浏览文件 @
ebb6393d
...
...
@@ -28,7 +28,7 @@ class RepositoryImportWorker
project
.
import_finish
project
.
save
project
.
satellite
.
create
unless
project
.
satellite
.
exists?
ProjectCacheWorker
.
perform_async
(
project
.
id
)
project
.
update_repository_size
Gitlab
::
BitbucketImport
::
KeyDeleter
.
new
(
project
).
execute
if
project
.
import_type
==
'bitbucket'
end
end
db/fixtures/development/04_project.rb
浏览文件 @
ebb6393d
...
...
@@ -11,42 +11,9 @@ Sidekiq::Testing.inline! do
'https://github.com/twitter/flight.git'
,
'https://github.com/twitter/typeahead.js.git'
,
'https://github.com/h5bp/html5-boilerplate.git'
,
'https://github.com/google/material-design-lite.git'
,
'https://github.com/jlevy/the-art-of-command-line.git'
,
'https://github.com/FreeCodeCamp/freecodecamp.git'
,
'https://github.com/google/deepdream.git'
,
'https://github.com/jtleek/datasharing.git'
,
'https://github.com/WebAssembly/design.git'
,
'https://github.com/airbnb/javascript.git'
,
'https://github.com/tessalt/echo-chamber-js.git'
,
'https://github.com/atom/atom.git'
,
'https://github.com/ipselon/react-ui-builder.git'
,
'https://github.com/mattermost/platform.git'
,
'https://github.com/purifycss/purifycss.git'
,
'https://github.com/facebook/nuclide.git'
,
'https://github.com/wbkd/awesome-d3.git'
,
'https://github.com/kilimchoi/engineering-blogs.git'
,
'https://github.com/gilbarbara/logos.git'
,
'https://github.com/gaearon/redux.git'
,
'https://github.com/awslabs/s2n.git'
,
'https://github.com/arkency/reactjs_koans.git'
,
'https://github.com/twbs/bootstrap.git'
,
'https://github.com/chjj/ttystudio.git'
,
'https://github.com/DrBoolean/mostly-adequate-guide.git'
,
'https://github.com/octocat/Spoon-Knife.git'
,
'https://github.com/opencontainers/runc.git'
,
'https://github.com/googlesamples/android-topeka.git'
]
# You can specify how many projects you need during seed execution
size
=
if
ENV
[
'SIZE'
].
present?
ENV
[
'SIZE'
].
to_i
else
8
end
project_urls
.
first
(
size
).
each_with_index
do
|
url
,
i
|
project_urls
.
each_with_index
do
|
url
,
i
|
group_path
,
project_path
=
url
.
split
(
'/'
)[
-
2
..-
1
]
group
=
Group
.
find_by
(
path:
group_path
)
...
...
db/migrate/20150717130904_add_commits_count_to_project.rb
已删除
100644 → 0
浏览文件 @
55b4f31d
class
AddCommitsCountToProject
<
ActiveRecord
::
Migration
def
change
add_column
:projects
,
:commit_count
,
:integer
,
default:
0
end
end
db/schema.rb
浏览文件 @
ebb6393d
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2015071
7130904
)
do
ActiveRecord
::
Schema
.
define
(
version:
2015071
3160110
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -374,7 +374,6 @@ ActiveRecord::Schema.define(version: 20150717130904) do
t
.
integer
"star_count"
,
default:
0
,
null:
false
t
.
string
"import_type"
t
.
string
"import_source"
t
.
integer
"commit_count"
,
default:
0
end
add_index
"projects"
,
[
"created_at"
,
"id"
],
name:
"index_projects_on_created_at_and_id"
,
using: :btree
...
...
lib/repository_cache.rb
浏览文件 @
ebb6393d
...
...
@@ -18,12 +18,4 @@ class RepositoryCache
def
fetch
(
key
,
&
block
)
backend
.
fetch
(
cache_key
(
key
),
&
block
)
end
def
exist?
(
key
)
backend
.
exist?
(
cache_key
(
key
))
end
def
read
(
key
)
backend
.
read
(
cache_key
(
key
))
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录