Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6bf781e4
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 搜索 >>
提交
6bf781e4
编写于
8月 14, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix autocomplete broken tests
上级
b67e333c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
10 deletion
+13
-10
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-1
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+1
-1
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+1
-1
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+1
-2
spec/features/participants_autocomplete_spec.rb
spec/features/participants_autocomplete_spec.rb
+9
-5
未找到文件。
app/assets/javascripts/dispatcher.js
浏览文件 @
6bf781e4
...
...
@@ -98,7 +98,7 @@ import initChangesDropdown from './init_changes_dropdown';
path
=
page
.
split
(
'
:
'
);
shortcut_handler
=
null
;
$
(
'
.js-gfm-input
'
).
each
((
i
,
el
)
=>
{
$
(
'
.js-gfm-input
:not(.js-vue-textarea)
'
).
each
((
i
,
el
)
=>
{
const
gfm
=
new
GfmAutoComplete
(
gl
.
GfmAutoComplete
&&
gl
.
GfmAutoComplete
.
dataSources
);
const
enableGFM
=
gl
.
utils
.
convertPermissionToBoolean
(
el
.
dataset
.
supportsAutocomplete
);
gfm
.
setup
(
$
(
el
),
{
...
...
app/assets/javascripts/notes/components/issue_comment_form.vue
浏览文件 @
6bf781e4
...
...
@@ -240,7 +240,7 @@
<textarea
id=
"note-body"
name=
"note[note]"
class=
"note-textarea js-vue-comment-form js-gfm-input js-autosize markdown-area"
class=
"note-textarea js-vue-comment-form js-gfm-input js-autosize markdown-area
js-vue-textarea
"
data-supports-quick-actions=
"true"
aria-label=
"Description"
v-model=
"note"
...
...
app/assets/javascripts/notes/components/issue_note_form.vue
浏览文件 @
6bf781e4
...
...
@@ -131,7 +131,7 @@
<textarea
id=
"note_note"
name=
"note[note]"
class=
"note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
class=
"note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form
js-vue-textarea
"
:data-supports-quick-actions=
"!isEditing"
aria-label=
"Description"
v-model=
"note"
...
...
app/views/projects/issues/_discussion.html.haml
浏览文件 @
6bf781e4
-
@gfm_form
=
true
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
=
link_to
'Reopen issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
format:
'json'
),
data:
{
original_text:
"Reopen issue"
,
alternative_text:
"Comment & reopen issue"
},
class:
"btn btn-nr btn-reopen btn-comment js-note-target-reopen
#{
issue_button_visibility
(
@issue
,
false
)
}
"
,
title:
'Reopen issue'
...
...
@@ -16,5 +17,3 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'notes'
=
render
"layouts/init_auto_complete"
spec/features/participants_autocomplete_spec.rb
浏览文件 @
6bf781e4
...
...
@@ -11,10 +11,14 @@ feature 'Member autocomplete', :js do
sign_in
(
user
)
end
shared_examples
"open suggestions when typing @"
do
shared_examples
"open suggestions when typing @"
do
|
resource_name
|
before
do
page
.
within
(
'.new-note'
)
do
find
(
'#note_note'
).
send_keys
(
'@'
)
if
resource_name
==
'issue'
find
(
'#note-body'
).
send_keys
(
'@'
)
else
find
(
'#note_note'
).
send_keys
(
'@'
)
end
end
end
...
...
@@ -32,7 +36,7 @@ feature 'Member autocomplete', :js do
visit
project_issue_path
(
project
,
noteable
)
end
include_examples
"open suggestions when typing @"
include_examples
"open suggestions when typing @"
,
'issue'
end
context
'adding a new note on a Merge Request'
do
...
...
@@ -45,7 +49,7 @@ feature 'Member autocomplete', :js do
visit
project_merge_request_path
(
project
,
noteable
)
end
include_examples
"open suggestions when typing @"
include_examples
"open suggestions when typing @"
,
'merge_request'
end
context
'adding a new note on a Commit'
do
...
...
@@ -60,6 +64,6 @@ feature 'Member autocomplete', :js do
visit
project_commit_path
(
project
,
noteable
)
end
include_examples
"open suggestions when typing @"
include_examples
"open suggestions when typing @"
,
'commit'
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录