Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a4633537
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,发现更多精彩内容 >>
提交
a4633537
编写于
9月 04, 2012
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add "empty_repo?" method to Repository role
Replaces two calls that this method simplifies
上级
7e76610d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
6 deletion
+32
-6
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/roles/repository.rb
app/roles/repository.rb
+8
-4
spec/roles/repository_spec.rb
spec/roles/repository_spec.rb
+22
-0
未找到文件。
app/controllers/application_controller.rb
浏览文件 @
a4633537
...
...
@@ -135,7 +135,7 @@ class ApplicationController < ActionController::Base
end
def
require_non_empty_project
redirect_to
@project
unless
@project
.
repo_exists?
&&
@project
.
has_commits
?
redirect_to
@project
if
@project
.
empty_repo
?
end
def
no_cache_headers
...
...
app/controllers/projects_controller.rb
浏览文件 @
a4633537
...
...
@@ -50,7 +50,7 @@ class ProjectsController < ApplicationController
respond_to
do
|
format
|
format
.
html
do
if
@project
.
repo_exists?
&&
@project
.
has_commits
?
unless
@project
.
empty_repo
?
@last_push
=
current_user
.
recent_push
(
@project
.
id
)
render
:show
else
...
...
app/roles/repository.rb
浏览文件 @
a4633537
...
...
@@ -8,6 +8,10 @@ module Repository
false
end
def
empty_repo?
!
repo_exists?
||
!
has_commits?
end
def
commit
(
commit_id
=
nil
)
Commit
.
find_or_first
(
repo
,
commit_id
,
root_ref
)
end
...
...
@@ -38,7 +42,7 @@ module Repository
def
has_post_receive_file?
hook_file
=
File
.
join
(
path_to_repo
,
'hooks'
,
'post-receive'
)
File
.
exists?
(
hook_file
)
File
.
exists?
(
hook_file
)
end
def
tags
...
...
@@ -67,7 +71,7 @@ module Repository
def
repo_exists?
@repo_exists
||=
(
repo
&&
!
repo
.
branches
.
empty?
)
rescue
rescue
@repo_exists
=
false
end
...
...
@@ -94,7 +98,7 @@ module Repository
!!
commit
end
def
root_ref
def
root_ref
default_branch
||
"master"
end
...
...
@@ -104,7 +108,7 @@ module Repository
# Archive Project to .tar.gz
#
# Already packed repo archives stored at
# Already packed repo archives stored at
# app_root/tmp/repositories/project_name/project_name-commit-id.tag.gz
#
def
archive_repo
ref
...
...
spec/roles/repository_spec.rb
0 → 100644
浏览文件 @
a4633537
require
'spec_helper'
describe
Project
,
"Repository"
do
let
(
:project
)
{
build
(
:project
)
}
describe
"#empty_repo?"
do
it
"should return true if the repo doesn't exist"
do
project
.
stub
(
repo_exists?:
false
,
has_commits?:
true
)
project
.
should
be_empty_repo
end
it
"should return true if the repo has commits"
do
project
.
stub
(
repo_exists?:
true
,
has_commits?:
false
)
project
.
should
be_empty_repo
end
it
"should return false if the repo exists and has commits"
do
project
.
stub
(
repo_exists?:
true
,
has_commits?:
true
)
project
.
should_not
be_empty_repo
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录