Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a7e2c492
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,发现更多精彩内容 >>
提交
a7e2c492
编写于
12月 09, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature/gitlab_shell_path' of /home/git/repositories/gitlab/gitlabhq
上级
a215dbe4
f1c82bc5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
14 deletion
+21
-14
config/gitlab.yml.example
config/gitlab.yml.example
+2
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+18
-14
未找到文件。
config/gitlab.yml.example
浏览文件 @
a7e2c492
...
...
@@ -174,6 +174,8 @@ production: &base
## GitLab Shell settings
gitlab_shell:
path: /home/git/gitlab-shell/
# REPOS_PATH MUST NOT BE A SYMLINK!!!
repos_path: /home/git/repositories/
hooks_path: /home/git/gitlab-shell/hooks/
...
...
config/initializers/1_settings.rb
浏览文件 @
a7e2c492
...
...
@@ -114,6 +114,7 @@ Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?
# GitLab Shell
#
Settings
[
'gitlab_shell'
]
||=
Settingslogic
.
new
({})
Settings
.
gitlab_shell
[
'path'
]
||=
Settings
.
gitlab
[
'user_home'
]
+
'/gitlab-shell/'
Settings
.
gitlab_shell
[
'hooks_path'
]
||=
Settings
.
gitlab
[
'user_home'
]
+
'/gitlab-shell/hooks/'
Settings
.
gitlab_shell
[
'receive_pack'
]
=
true
if
Settings
.
gitlab_shell
[
'receive_pack'
].
nil?
Settings
.
gitlab_shell
[
'upload_pack'
]
=
true
if
Settings
.
gitlab_shell
[
'upload_pack'
].
nil?
...
...
lib/gitlab/backend/shell.rb
浏览文件 @
a7e2c492
...
...
@@ -10,7 +10,7 @@ module Gitlab
# add_repository("gitlab/gitlab-ci")
#
def
add_repository
(
name
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"add-project"
,
"
#{
name
}
.git"
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"add-project"
,
"
#{
name
}
.git"
end
# Import repository
...
...
@@ -21,7 +21,7 @@ module Gitlab
# import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
#
def
import_repository
(
name
,
url
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"import-project"
,
"
#{
name
}
.git"
,
url
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"import-project"
,
"
#{
name
}
.git"
,
url
end
# Move repository
...
...
@@ -33,7 +33,7 @@ module Gitlab
# mv_repository("gitlab/gitlab-ci", "randx/gitlab-ci-new.git")
#
def
mv_repository
(
path
,
new_path
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"mv-project"
,
"
#{
path
}
.git"
,
"
#{
new_path
}
.git"
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"mv-project"
,
"
#{
path
}
.git"
,
"
#{
new_path
}
.git"
end
# Update HEAD for repository
...
...
@@ -45,7 +45,7 @@ module Gitlab
# update_repository_head("gitlab/gitlab-ci", "3-1-stable")
#
def
update_repository_head
(
path
,
branch
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"update-head"
,
"
#{
path
}
.git"
,
branch
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"update-head"
,
"
#{
path
}
.git"
,
branch
end
# Fork repository to new namespace
...
...
@@ -57,7 +57,7 @@ module Gitlab
# fork_repository("gitlab/gitlab-ci", "randx")
#
def
fork_repository
(
path
,
fork_namespace
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"fork-project"
,
"
#{
path
}
.git"
,
fork_namespace
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"fork-project"
,
"
#{
path
}
.git"
,
fork_namespace
end
# Remove repository from file system
...
...
@@ -68,7 +68,7 @@ module Gitlab
# remove_repository("gitlab/gitlab-ci")
#
def
remove_repository
(
name
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"rm-project"
,
"
#{
name
}
.git"
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"rm-project"
,
"
#{
name
}
.git"
end
# Add repository branch from passed ref
...
...
@@ -81,7 +81,7 @@ module Gitlab
# add_branch("gitlab/gitlab-ci", "4-0-stable", "master")
#
def
add_branch
(
path
,
branch_name
,
ref
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"create-branch"
,
"
#{
path
}
.git"
,
branch_name
,
ref
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"create-branch"
,
"
#{
path
}
.git"
,
branch_name
,
ref
end
# Remove repository branch
...
...
@@ -93,7 +93,7 @@ module Gitlab
# rm_branch("gitlab/gitlab-ci", "4-0-stable")
#
def
rm_branch
(
path
,
branch_name
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"rm-branch"
,
"
#{
path
}
.git"
,
branch_name
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"rm-branch"
,
"
#{
path
}
.git"
,
branch_name
end
# Add repository tag from passed ref
...
...
@@ -106,7 +106,7 @@ module Gitlab
# add_tag("gitlab/gitlab-ci", "v4.0", "master")
#
def
add_tag
(
path
,
tag_name
,
ref
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"create-tag"
,
"
#{
path
}
.git"
,
tag_name
,
ref
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"create-tag"
,
"
#{
path
}
.git"
,
tag_name
,
ref
end
# Remove repository tag
...
...
@@ -118,7 +118,7 @@ module Gitlab
# rm_tag("gitlab/gitlab-ci", "v4.0")
#
def
rm_tag
(
path
,
tag_name
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-projects"
,
"rm-tag"
,
"
#{
path
}
.git"
,
tag_name
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-projects"
,
"rm-tag"
,
"
#{
path
}
.git"
,
tag_name
end
# Add new key to gitlab-shell
...
...
@@ -127,7 +127,7 @@ module Gitlab
# add_key("key-42", "sha-rsa ...")
#
def
add_key
(
key_id
,
key_content
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-keys"
,
"add-key"
,
key_id
,
key_content
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-keys"
,
"add-key"
,
key_id
,
key_content
end
# Remove ssh key from gitlab shell
...
...
@@ -136,7 +136,7 @@ module Gitlab
# remove_key("key-342", "sha-rsa ...")
#
def
remove_key
(
key_id
,
key_content
)
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-keys"
,
"rm-key"
,
key_id
,
key_content
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-keys"
,
"rm-key"
,
key_id
,
key_content
end
# Remove all ssh keys from gitlab shell
...
...
@@ -145,7 +145,7 @@ module Gitlab
# remove_all_keys
#
def
remove_all_keys
system
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/bin/gitlab-keys"
,
"clear"
system
"
#{
gitlab_shell_
path
}
/bin/gitlab-keys"
,
"clear"
end
# Add empty directory for storing repositories
...
...
@@ -198,7 +198,7 @@ module Gitlab
# Return GitLab shell version
def
version
gitlab_shell_version_file
=
"
#{
gitlab_shell_
user_home
}
/gitlab-shell
/VERSION"
gitlab_shell_version_file
=
"
#{
gitlab_shell_
path
}
/VERSION"
if
File
.
readable?
(
gitlab_shell_version_file
)
File
.
read
(
gitlab_shell_version_file
)
...
...
@@ -207,6 +207,10 @@ module Gitlab
protected
def
gitlab_shell_path
Gitlab
.
config
.
gitlab_shell
.
path
end
def
gitlab_shell_user_home
File
.
expand_path
(
"~
#{
Gitlab
.
config
.
gitlab_shell
.
ssh_user
}
"
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录