Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
59a2e179
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,发现更多精彩内容 >>
提交
59a2e179
编写于
7月 06, 2016
作者:
T
tiagonbotelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes more issues for MR acceptance
上级
d6664a2b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
16 deletion
+17
-16
app/models/repository.rb
app/models/repository.rb
+12
-12
app/services/files/update_service.rb
app/services/files/update_service.rb
+3
-2
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+2
-2
未找到文件。
app/models/repository.rb
浏览文件 @
59a2e179
...
...
@@ -742,29 +742,29 @@ class Repository
end
# previous_path, message, update
def
update_file
(
user
,
path
,
content
,
branch
,
options
=
{}
)
def
update_file
(
user
,
path
,
content
,
branch
:,
previous_path
:,
message
:
)
commit_with_hooks
(
user
,
branch
)
do
|
ref
|
committer
=
user_to_committer
(
user
)
commit_
options
=
{}
commit_
options
[
:committer
]
=
committer
commit_
options
[
:author
]
=
committer
commit_
options
[
:commit
]
=
{
message:
options
[
:message
]
,
options
=
{}
options
[
:committer
]
=
committer
options
[
:author
]
=
committer
options
[
:commit
]
=
{
message:
message
,
branch:
ref
}
commit_
options
[
:file
]
=
{
options
[
:file
]
=
{
content:
content
,
path:
path
,
update:
options
[
:update
]
update:
true
}
if
options
[
:previous_path
]
commit_options
[
:file
][
:previous_path
]
=
options
[
:previous_path
]
if
previous_path
options
[
:file
][
:previous_path
]
=
previous_path
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
commit_
options
)
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
options
)
else
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
commit_
options
)
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
options
)
end
end
end
...
...
app/services/files/update_service.rb
浏览文件 @
59a2e179
...
...
@@ -4,8 +4,9 @@ module Files
class
UpdateService
<
Files
::
BaseService
def
commit
repository
.
update_file
(
current_user
,
@file_path
,
@file_content
,
@target_branch
,
previous_path:
@previous_path
,
message:
@commit_message
,
update:
true
)
branch:
@target_branch
,
previous_path:
@previous_path
,
message:
@commit_message
)
end
end
end
app/views/projects/blob/_editor.html.haml
浏览文件 @
59a2e179
...
...
@@ -4,8 +4,8 @@
=
icon
(
'code-fork'
)
=
ref
%span
.editor-file-name
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
=
text_field_tag
'file_name'
,
(
params
[
:file_name
]
or
@path
),
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
=
text_field_tag
'file_name'
,
(
params
[
:file_name
]
||
@path
),
class:
'form-control new-file-name'
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录