Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
08dc8af7
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 搜索 >>
提交
08dc8af7
编写于
8月 24, 2016
作者:
T
tiagonbotelho
提交者:
Stan Hu
9月 09, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes distinction between renaming a file and updating its content and
refactors update file
上级
d01cbe0c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
9 deletion
+7
-9
CHANGELOG
CHANGELOG
+1
-0
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+1
-2
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+4
-6
app/models/repository.rb
app/models/repository.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
08dc8af7
...
...
@@ -18,6 +18,7 @@ v 8.12.0 (unreleased)
- Fix pagination on user snippets page
- Escape search term before passing it to Regexp.new !6241 (winniehell)
- Fix pinned sidebar behavior in smaller viewports !6169
- Fix file permissions change when updating a file on the Gitlab UI !5979
- Change merge_error column from string to text type
- Reduce contributions calendar data payload (ClemMakesApps)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
...
...
app/controllers/concerns/creates_commit.rb
浏览文件 @
08dc8af7
...
...
@@ -7,8 +7,7 @@ module CreatesCommit
commit_params
=
@commit_params
.
merge
(
source_project:
@project
,
source_branch:
@ref
,
target_branch:
@target_branch
,
previous_path:
@previous_path
target_branch:
@target_branch
)
result
=
service
.
new
(
@tree_edit_project
,
current_user
,
commit_params
).
execute
...
...
app/controllers/projects/blob_controller.rb
浏览文件 @
08dc8af7
...
...
@@ -38,12 +38,7 @@ class Projects::BlobController < Projects::ApplicationController
end
def
update
if
params
[
:file_path
].
present?
@previous_path
=
@path
@path
=
params
[
:file_path
]
@commit_params
[
:file_path
]
=
@path
end
@path
=
params
[
:file_path
]
if
params
[
:file_path
].
present?
after_edit_path
=
if
from_merge_request
&&
@target_branch
==
@ref
diffs_namespace_project_merge_request_path
(
from_merge_request
.
target_project
.
namespace
,
from_merge_request
.
target_project
,
from_merge_request
)
+
...
...
@@ -143,6 +138,8 @@ class Projects::BlobController < Projects::ApplicationController
params
[
:file_name
]
=
params
[
:file
].
original_filename
end
File
.
join
(
@path
,
params
[
:file_name
])
elsif
params
[
:file_path
].
present?
params
[
:file_path
]
else
@path
end
...
...
@@ -155,6 +152,7 @@ class Projects::BlobController < Projects::ApplicationController
@commit_params
=
{
file_path:
@file_path
,
commit_message:
params
[
:commit_message
],
previous_path:
@path
,
file_content:
params
[
:content
],
file_content_encoding:
params
[
:encoding
],
last_commit_sha:
params
[
:last_commit_sha
]
...
...
app/models/repository.rb
浏览文件 @
08dc8af7
...
...
@@ -813,7 +813,7 @@ class Repository
update:
true
}
if
previous_path
unless
previous_path
==
path
||
previous_path
.
blank?
options
[
:file
][
:previous_path
]
=
previous_path
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
options
)
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录