Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a5035ed3
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 搜索 >>
提交
a5035ed3
编写于
9月 05, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correctly loads gfm autocomplete source on pages where it is required
上级
3531032e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
27 addition
and
7 deletion
+27
-7
CHANGELOG
CHANGELOG
+2
-0
app/views/layouts/_init_auto_complete.html.haml
app/views/layouts/_init_auto_complete.html.haml
+0
-4
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+1
-0
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+0
-3
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+1
-0
spec/features/projects/gfm_autocomplete_load_spec.rb
spec/features/projects/gfm_autocomplete_load_spec.rb
+23
-0
未找到文件。
CHANGELOG
浏览文件 @
a5035ed3
...
...
@@ -57,6 +57,8 @@ v 8.12.0 (unreleased)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Remove Gitorious import
- Loads GFM autocomplete source only when required
- Fix issue with slash commands not loading on new issue page
- Fix inconsistent background color for filter input field (ClemMakesApps)
- Remove prefixes from transition CSS property (ClemMakesApps)
- Add Sentry logging to API calls
...
...
app/views/layouts/_init_auto_complete.html.haml
浏览文件 @
a5035ed3
-
project
=
@target_project
||
@project
-
noteable_type
=
@noteable
.
class
if
@noteable
.
present?
-
if
noteable_type
:javascript
GitLab
.
GfmAutoComplete
.
dataLoading
=
false
;
:javascript
GitLab
.
GfmAutoComplete
.
dataSource
=
"
#{
autocomplete_sources_namespace_project_path
(
project
.
namespace
,
project
,
type:
noteable_type
,
type_id:
params
[
:id
])
}
"
GitLab
.
GfmAutoComplete
.
cachedData
=
undefined
;
...
...
app/views/layouts/application.html.haml
浏览文件 @
a5035ed3
...
...
@@ -10,4 +10,5 @@
=
render
"layouts/header/default"
,
title:
header_title
=
render
'layouts/page'
,
sidebar:
sidebar
,
nav:
nav
=
render
"layouts/init_auto_complete"
if
current_user
&&
@load_gfm
=
yield
:scripts_body
app/views/layouts/project.html.haml
浏览文件 @
a5035ed3
...
...
@@ -14,9 +14,6 @@
window
.
project_uploads_path
=
"
#{
namespace_project_uploads_path
project
.
namespace
,
project
}
"
;
window
.
preview_markdown_path
=
"
#{
preview_markdown_path
}
"
;
-
content_for
:scripts_body
do
=
render
"layouts/init_auto_complete"
if
current_user
-
content_for
:header_content
do
.js-dropdown-menu-projects
.dropdown-menu.dropdown-select.dropdown-menu-projects
...
...
app/views/projects/_zen.html.haml
浏览文件 @
a5035ed3
-
@load_gfm
=
true
-
supports_slash_commands
=
local_assigns
.
fetch
(
:supports_slash_commands
,
false
)
.zen-backdrop
-
classes
<<
' js-gfm-input js-autosize markdown-area'
...
...
spec/features/projects/gfm_autocomplete_load_spec.rb
0 → 100644
浏览文件 @
a5035ed3
require
'spec_helper'
describe
'GFM autocomplete loading'
,
feature:
true
,
js:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
before
do
project
.
team
<<
[
user
,
:master
]
login_as
user
visit
namespace_project_path
(
project
.
namespace
,
project
)
end
it
'does not load on project#show'
do
expect
(
evaluate_script
(
'GitLab.GfmAutoComplete.dataSource'
)).
to
eq
(
''
)
end
it
'loads on new issue page'
do
visit
new_namespace_project_issue_path
(
project
.
namespace
,
project
)
expect
(
evaluate_script
(
'GitLab.GfmAutoComplete.dataSource'
)).
not_to
eq
(
''
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录