Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ecb3f1eb
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 搜索 >>
提交
ecb3f1eb
编写于
4月 13, 2016
作者:
C
Christopher Bartz
提交者:
Rémy Coutable
8月 11, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename `markdown_preview` routes to `preview_markdown`
上级
a081b842
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
15 addition
and
14 deletion
+15
-14
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+1
-1
app/assets/javascripts/preview_markdown.js
app/assets/javascripts/preview_markdown.js
+2
-2
app/controllers/projects/wikis_controller.rb
app/controllers/projects/wikis_controller.rb
+1
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+3
-3
config/routes.rb
config/routes.rb
+2
-2
spec/routing/project_routing_spec.rb
spec/routing/project_routing_spec.rb
+4
-4
未找到文件。
CHANGELOG
浏览文件 @
ecb3f1eb
...
...
@@ -5,6 +5,7 @@ v 8.11.0 (unreleased)
- Fix don't pass a local variable called `i` to a partial. !20510 (herminiotorres)
- Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres)
- Fix the title of the toggle dropdown button. !5515 (herminiotorres)
- Rename `markdown_preview` routes to `preview_markdown`. (Christopher Bartz)
- Improve diff performance by eliminating redundant checks for text blobs
- Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi)
- Convert switch icon into icon font (ClemMakesApps)
...
...
app/assets/javascripts/dropzone_input.js
浏览文件 @
ecb3f1eb
/*= require
markdown_preview
*/
/*= require
preview_markdown
*/
(
function
()
{
this
.
DropzoneInput
=
(
function
()
{
...
...
app/assets/javascripts/
markdown_preview
.js
→
app/assets/javascripts/
preview_markdown
.js
浏览文件 @
ecb3f1eb
...
...
@@ -28,7 +28,7 @@
};
MarkdownPreview
.
prototype
.
renderMarkdown
=
function
(
text
,
success
)
{
if
(
!
window
.
markdown_preview
_path
)
{
if
(
!
window
.
preview_markdown
_path
)
{
return
;
}
if
(
text
===
this
.
ajaxCache
.
text
)
{
...
...
@@ -36,7 +36,7 @@
}
return
$
.
ajax
({
type
:
'
POST
'
,
url
:
window
.
markdown_preview
_path
,
url
:
window
.
preview_markdown
_path
,
data
:
{
text
:
text
},
...
...
app/controllers/projects/wikis_controller.rb
浏览文件 @
ecb3f1eb
...
...
@@ -91,7 +91,7 @@ class Projects::WikisController < Projects::ApplicationController
)
end
def
markdown_preview
def
preview_markdown
text
=
params
[
:text
]
ext
=
Gitlab
::
ReferenceExtractor
.
new
(
@project
,
current_user
)
...
...
app/controllers/projects_controller.rb
浏览文件 @
ecb3f1eb
...
...
@@ -238,7 +238,7 @@ class ProjectsController < Projects::ApplicationController
}
end
def
markdown_preview
def
preview_markdown
text
=
params
[
:text
]
ext
=
Gitlab
::
ReferenceExtractor
.
new
(
@project
,
current_user
)
...
...
app/views/layouts/project.html.haml
浏览文件 @
ecb3f1eb
...
...
@@ -6,13 +6,13 @@
-
content_for
:scripts_body_top
do
-
project
=
@target_project
||
@project
-
if
@project_wiki
&&
@page
-
markdown_preview_path
=
namespace_project_wiki_markdown_preview
_path
(
project
.
namespace
,
project
,
@page
.
slug
)
-
preview_markdown_path
=
namespace_project_wiki_preview_markdown
_path
(
project
.
namespace
,
project
,
@page
.
slug
)
-
else
-
markdown_preview_path
=
markdown_preview
_namespace_project_path
(
project
.
namespace
,
project
)
-
preview_markdown_path
=
preview_markdown
_namespace_project_path
(
project
.
namespace
,
project
)
-
if
current_user
:javascript
window
.
project_uploads_path
=
"
#{
namespace_project_uploads_path
project
.
namespace
,
project
}
"
;
window
.
markdown_preview_path
=
"
#{
markdown_preview
_path
}
"
;
window
.
preview_markdown_path
=
"
#{
preview_markdown
_path
}
"
;
-
content_for
:scripts_body
do
=
render
"layouts/init_auto_complete"
if
current_user
...
...
config/routes.rb
浏览文件 @
ecb3f1eb
...
...
@@ -471,7 +471,7 @@ Rails.application.routes.draw do
post
:unarchive
post
:housekeeping
post
:toggle_star
post
:
markdown_preview
post
:
preview_markdown
post
:export
post
:remove_export
post
:generate_new_export
...
...
@@ -660,7 +660,7 @@ Rails.application.routes.draw do
get
'/wikis/*id'
,
to:
'wikis#show'
,
as:
'wiki'
,
constraints:
WIKI_SLUG_ID
delete
'/wikis/*id'
,
to:
'wikis#destroy'
,
constraints:
WIKI_SLUG_ID
put
'/wikis/*id'
,
to:
'wikis#update'
,
constraints:
WIKI_SLUG_ID
post
'/wikis/*id/
markdown_preview'
,
to:
'wikis#markdown_preview'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_markdown_preview
'
post
'/wikis/*id/
preview_markdown'
,
to:
'wikis#preview_markdown'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_preview_markdown
'
end
resource
:repository
,
only:
[
:create
]
do
...
...
spec/routing/project_routing_spec.rb
浏览文件 @
ecb3f1eb
...
...
@@ -60,7 +60,7 @@ end
# project GET /:id(.:format) projects#show
# PUT /:id(.:format) projects#update
# DELETE /:id(.:format) projects#destroy
#
markdown_preview_project POST /:id/markdown_preview(.:format) projects#markdown_preview
#
preview_markdown_project POST /:id/preview_markdown(.:format) projects#preview_markdown
describe
ProjectsController
,
'routing'
do
it
'to #create'
do
expect
(
post
(
'/projects'
)).
to
route_to
(
'projects#create'
)
...
...
@@ -91,9 +91,9 @@ describe ProjectsController, 'routing' do
expect
(
delete
(
'/gitlab/gitlabhq'
)).
to
route_to
(
'projects#destroy'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq'
)
end
it
'to #
markdown_preview
'
do
expect
(
post
(
'/gitlab/gitlabhq/
markdown_preview
'
)).
to
(
route_to
(
'projects#
markdown_preview
'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq'
)
it
'to #
preview_markdown
'
do
expect
(
post
(
'/gitlab/gitlabhq/
preview_markdown
'
)).
to
(
route_to
(
'projects#
preview_markdown
'
,
namespace_id:
'gitlab'
,
id:
'gitlabhq'
)
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录