Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4227f6ed
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,发现更多精彩内容 >>
提交
4227f6ed
编写于
12月 16, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5856 from nishigori/fix-typo
Fix messages typo
上级
3f709e0a
e78b90ab
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
8 deletion
+8
-8
app/contexts/files/create_context.rb
app/contexts/files/create_context.rb
+3
-3
app/contexts/files/delete_context.rb
app/contexts/files/delete_context.rb
+1
-1
app/contexts/files/update_context.rb
app/contexts/files/update_context.rb
+1
-1
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+1
-1
app/controllers/projects/edit_tree_controller.rb
app/controllers/projects/edit_tree_controller.rb
+1
-1
app/controllers/projects/new_tree_controller.rb
app/controllers/projects/new_tree_controller.rb
+1
-1
未找到文件。
app/contexts/files/create_context.rb
浏览文件 @
4227f6ed
...
...
@@ -21,13 +21,13 @@ module Files
file_path
=
path
unless
file_name
=~
Gitlab
::
Regex
.
path_regex
return
error
(
"Your changes could not be commited, because file name contains not allowed characters"
)
return
error
(
"Your changes could not be commit
t
ed, because file name contains not allowed characters"
)
end
blob
=
repository
.
blob_at
(
ref
,
file_path
)
if
blob
return
error
(
"Your changes could not be commited, because file with such name exists"
)
return
error
(
"Your changes could not be commit
t
ed, because file with such name exists"
)
end
new_file_action
=
Gitlab
::
Satellite
::
NewFileAction
.
new
(
current_user
,
project
,
ref
,
file_path
)
...
...
@@ -39,7 +39,7 @@ module Files
if
created_successfully
success
else
error
(
"Your changes could not be commited, because the file has been changed"
)
error
(
"Your changes could not be commit
t
ed, because the file has been changed"
)
end
end
end
...
...
app/contexts/files/delete_context.rb
浏览文件 @
4227f6ed
...
...
@@ -33,7 +33,7 @@ module Files
if
deleted_successfully
success
else
error
(
"Your changes could not be commited, because the file has been changed"
)
error
(
"Your changes could not be commit
t
ed, because the file has been changed"
)
end
end
end
...
...
app/contexts/files/update_context.rb
浏览文件 @
4227f6ed
...
...
@@ -32,7 +32,7 @@ module Files
if
created_successfully
success
else
error
(
"Your changes could not be commited, because the file has been changed"
)
error
(
"Your changes could not be commit
t
ed, because the file has been changed"
)
end
end
end
...
...
app/controllers/projects/blob_controller.rb
浏览文件 @
4227f6ed
...
...
@@ -16,7 +16,7 @@ class Projects::BlobController < Projects::ApplicationController
result
=
Files
::
DeleteContext
.
new
(
@project
,
current_user
,
params
,
@ref
,
@path
).
execute
if
result
[
:status
]
==
:success
flash
[
:notice
]
=
"Your changes have been successfully commited"
flash
[
:notice
]
=
"Your changes have been successfully commit
t
ed"
redirect_to
project_tree_path
(
@project
,
@ref
)
else
flash
[
:alert
]
=
result
[
:error
]
...
...
app/controllers/projects/edit_tree_controller.rb
浏览文件 @
4227f6ed
...
...
@@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::BaseTreeController
result
=
Files
::
UpdateContext
.
new
(
@project
,
current_user
,
params
,
@ref
,
@path
).
execute
if
result
[
:status
]
==
:success
flash
[
:notice
]
=
"Your changes have been successfully commited"
flash
[
:notice
]
=
"Your changes have been successfully commit
t
ed"
redirect_to
project_blob_path
(
@project
,
@id
)
else
flash
[
:alert
]
=
result
[
:error
]
...
...
app/controllers/projects/new_tree_controller.rb
浏览文件 @
4227f6ed
...
...
@@ -9,7 +9,7 @@ class Projects::NewTreeController < Projects::BaseTreeController
result
=
Files
::
CreateContext
.
new
(
@project
,
current_user
,
params
,
@ref
,
file_path
).
execute
if
result
[
:status
]
==
:success
flash
[
:notice
]
=
"Your changes have been successfully commited"
flash
[
:notice
]
=
"Your changes have been successfully commit
t
ed"
redirect_to
project_blob_path
(
@project
,
File
.
join
(
@ref
,
file_path
))
else
flash
[
:alert
]
=
result
[
:error
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录