Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
815e678c
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,发现更多精彩内容 >>
提交
815e678c
编写于
8月 11, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Use rugged in web editor for base64 encoding"
This reverts commit
54113319
.
上级
34975f01
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
28 deletion
+34
-28
app/services/files/create_service.rb
app/services/files/create_service.rb
+17
-14
app/services/files/update_service.rb
app/services/files/update_service.rb
+17
-14
未找到文件。
app/services/files/create_service.rb
浏览文件 @
815e678c
...
@@ -33,20 +33,23 @@ module Files
...
@@ -33,20 +33,23 @@ module Files
end
end
end
end
content
=
if
params
[
:encoding
]
==
'base64'
if
params
[
:encoding
]
==
'base64'
new_file_action
=
Gitlab
::
Satellite
::
NewFileAction
.
new
(
current_user
,
project
,
ref
,
file_path
)
Base64
.
decode64
(
params
[
:content
])
created_successfully
=
new_file_action
.
commit!
(
else
params
[
:content
],
params
[
:content
]
params
[
:commit_message
],
end
params
[
:encoding
],
params
[
:new_branch
]
created_successfully
=
repository
.
commit_file
(
)
current_user
,
else
file_path
,
created_successfully
=
repository
.
commit_file
(
content
,
current_user
,
params
[
:commit_message
],
file_path
,
params
[
:new_branch
]
||
ref
params
[
:content
],
)
params
[
:commit_message
],
params
[
:new_branch
]
||
ref
)
end
if
created_successfully
if
created_successfully
...
...
app/services/files/update_service.rb
浏览文件 @
815e678c
...
@@ -19,20 +19,23 @@ module Files
...
@@ -19,20 +19,23 @@ module Files
return
error
(
"You can only edit text files"
)
return
error
(
"You can only edit text files"
)
end
end
content
=
if
params
[
:encoding
]
==
'base64'
if
params
[
:encoding
]
==
'base64'
edit_file_action
=
Gitlab
::
Satellite
::
EditFileAction
.
new
(
current_user
,
project
,
ref
,
path
)
Base64
.
decode64
(
params
[
:content
])
edit_file_action
.
commit!
(
else
params
[
:content
],
params
[
:content
]
params
[
:commit_message
],
end
params
[
:encoding
],
params
[
:new_branch
]
repository
.
commit_file
(
)
current_user
,
else
path
,
repository
.
commit_file
(
content
,
current_user
,
params
[
:commit_message
],
path
,
params
[
:new_branch
]
||
ref
params
[
:content
],
)
params
[
:commit_message
],
params
[
:new_branch
]
||
ref
)
end
success
success
rescue
Gitlab
::
Satellite
::
CheckoutFailed
=>
ex
rescue
Gitlab
::
Satellite
::
CheckoutFailed
=>
ex
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录