Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b96a3d4d
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,发现更多精彩内容 >>
提交
b96a3d4d
编写于
8月 11, 2017
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix open discussions
Put back deleted tests
上级
b38e6903
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
24 addition
and
11 deletion
+24
-11
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+1
-1
app/assets/javascripts/notes/components/issue_note_awards_list.vue
...s/javascripts/notes/components/issue_note_awards_list.vue
+16
-2
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+0
-1
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+1
-1
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+1
-1
features/steps/shared/note.rb
features/steps/shared/note.rb
+1
-1
spec/features/merge_requests/user_uses_slash_commands_spec.rb
.../features/merge_requests/user_uses_slash_commands_spec.rb
+3
-3
spec/features/participants_autocomplete_spec.rb
spec/features/participants_autocomplete_spec.rb
+1
-1
未找到文件。
app/assets/javascripts/notes/components/issue_discussion.vue
浏览文件 @
b96a3d4d
<
script
>
/* global Flash
, Autosave
*/
/* global Flash */
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
issueNote
from
'
./issue_note.vue
'
;
...
...
app/assets/javascripts/notes/components/issue_note_awards_list.vue
浏览文件 @
b96a3d4d
...
...
@@ -140,11 +140,25 @@
return
title
;
},
handleAward
(
awardName
)
{
let
parsedName
;
// 100 and 1234 emoji are a number. Callback for v-for click sends it as a string
switch
(
awardName
)
{
case
'
100
'
:
parsedName
=
100
;
break
;
case
'
1234
'
:
parsedName
=
1234
;
break
;
default
:
parsedName
=
awardName
;
break
;
}
const
data
=
{
endpoint
:
this
.
toggleAwardPath
,
noteId
:
this
.
noteId
,
// 100 emoji is a number. Callback for v-for click sends it as a string
awardName
:
awardName
===
'
100
'
?
100
:
awardName
,
awardName
:
parsedName
,
};
this
.
toggleAwardRequest
(
data
)
...
...
app/assets/javascripts/notes/components/issue_note_form.vue
浏览文件 @
b96a3d4d
...
...
@@ -129,7 +129,6 @@
:quick-actions-docs=
"quickActionsDocsUrl"
:add-spacing-classes=
"false"
>
<textarea
id=
"note-body"
name=
"note[note]"
class=
"note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
:data-supports-quick-actions=
"!isEditing"
...
...
app/assets/javascripts/notes/stores/actions.js
浏览文件 @
b96a3d4d
...
...
@@ -86,7 +86,7 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
const
{
errors
}
=
res
;
const
commandsChanges
=
res
.
commands_changes
;
if
(
hasQuickActions
&&
Object
.
keys
(
errors
).
length
)
{
if
(
hasQuickActions
&&
errors
&&
Object
.
keys
(
errors
).
length
)
{
dispatch
(
'
fetchData
'
);
$
(
'
.js-gfm-input
'
).
trigger
(
'
clear-commands-cache.atwho
'
);
...
...
app/views/projects/issues/_discussion.html.haml
浏览文件 @
b96a3d4d
...
...
@@ -17,4 +17,4 @@
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'notes'
=
render
"layouts/init_auto_complete"
\ No newline at end of file
=
render
"layouts/init_auto_complete"
features/steps/shared/note.rb
浏览文件 @
b96a3d4d
...
...
@@ -156,7 +156,7 @@ module SharedNote
page
.
find
(
'.current-note-edit-form textarea'
)
page
.
within
(
".current-note-edit-form"
)
do
fill_in
'
#note-body
'
,
with:
'+1 Awesome!'
fill_in
'
note[note]
'
,
with:
'+1 Awesome!'
click_button
'Save comment'
end
wait_for_requests
...
...
spec/features/merge_requests/user_uses_slash_commands_spec.rb
浏览文件 @
b96a3d4d
...
...
@@ -67,7 +67,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
it
'does not change the WIP prefix'
do
write_note
(
"/wip"
)
expect
(
page
).
to
have_content
'/wip'
expect
(
page
).
not_
to
have_content
'/wip'
expect
(
page
).
not_to
have_content
'Commands applied'
expect
(
merge_request
.
reload
.
work_in_progress?
).
to
eq
false
...
...
@@ -78,7 +78,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
describe
'merging the MR from the note'
do
context
'when the current user can merge the MR'
do
it
'merges the MR'
do
write_note
(
"/merge"
,
false
)
write_note
(
"/merge"
)
expect
(
page
).
to
have_content
'Commands applied'
...
...
@@ -197,7 +197,7 @@ feature 'Merge Requests > User uses quick actions', js: true do
it
'does not change target branch'
do
write_note
(
'/target_branch merge-test'
)
expect
(
page
).
to
have_content
'/target_branch merge-test'
expect
(
page
).
not_
to
have_content
'/target_branch merge-test'
expect
(
merge_request
.
target_branch
).
to
eq
'feature'
end
...
...
spec/features/participants_autocomplete_spec.rb
浏览文件 @
b96a3d4d
...
...
@@ -15,7 +15,7 @@ feature 'Member autocomplete', :js do
before
do
page
.
within
(
'.new-note'
)
do
if
note
.
noteable_type
===
'Issue'
find
(
'
#note-body
'
).
send_keys
(
'@'
)
find
(
'
.js-vue-comment-form
'
).
send_keys
(
'@'
)
else
find
(
'#note_note'
).
send_keys
(
'@'
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录