Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6b35c4ad
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,发现更多精彩内容 >>
提交
6b35c4ad
编写于
11月 17, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Merge branch '22680-unlabel-limit-autocomplete-to-selected-items' into 'master'"
This reverts merge request !6796
上级
11ba759d
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
2 addition
and
21 deletion
+2
-21
app/assets/javascripts/gfm_auto_complete.js.es6
app/assets/javascripts/gfm_auto_complete.js.es6
+0
-6
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-3
app/services/projects/autocomplete_service.rb
app/services/projects/autocomplete_service.rb
+1
-8
changelogs/unreleased/22680-unlabel-limit-autocomplete-to-selected-items.yml
...ed/22680-unlabel-limit-autocomplete-to-selected-items.yml
+0
-4
未找到文件。
app/assets/javascripts/gfm_auto_complete.js.es6
浏览文件 @
6b35c4ad
...
@@ -51,11 +51,6 @@
...
@@ -51,11 +51,6 @@
if (!GitLab.GfmAutoComplete.dataLoaded) {
if (!GitLab.GfmAutoComplete.dataLoaded) {
return this.at;
return this.at;
} else {
} else {
if (value.indexOf("unlabel") !== -1) {
GitLab.GfmAutoComplete.input.atwho('load', '~', GitLab.GfmAutoComplete.cachedData.unlabels);
} else {
GitLab.GfmAutoComplete.input.atwho('load', '~', GitLab.GfmAutoComplete.cachedData.labels);
}
return value;
return value;
}
}
}
}
...
@@ -363,4 +358,3 @@
...
@@ -363,4 +358,3 @@
};
};
}).call(this);
}).call(this);
app/controllers/projects_controller.rb
浏览文件 @
6b35c4ad
...
@@ -144,15 +144,13 @@ class ProjectsController < Projects::ApplicationController
...
@@ -144,15 +144,13 @@ class ProjectsController < Projects::ApplicationController
autocomplete
=
::
Projects
::
AutocompleteService
.
new
(
@project
,
current_user
)
autocomplete
=
::
Projects
::
AutocompleteService
.
new
(
@project
,
current_user
)
participants
=
::
Projects
::
ParticipantsService
.
new
(
@project
,
current_user
).
execute
(
noteable
)
participants
=
::
Projects
::
ParticipantsService
.
new
(
@project
,
current_user
).
execute
(
noteable
)
unlabels
=
autocomplete
.
unlabels
(
noteable
)
@suggestions
=
{
@suggestions
=
{
emojis:
Gitlab
::
AwardEmoji
.
urls
,
emojis:
Gitlab
::
AwardEmoji
.
urls
,
issues:
autocomplete
.
issues
,
issues:
autocomplete
.
issues
,
milestones:
autocomplete
.
milestones
,
milestones:
autocomplete
.
milestones
,
mergerequests:
autocomplete
.
merge_requests
,
mergerequests:
autocomplete
.
merge_requests
,
labels:
autocomplete
.
labels
-
unlabels
,
labels:
autocomplete
.
labels
,
unlabels:
unlabels
,
members:
participants
,
members:
participants
,
commands:
autocomplete
.
commands
(
noteable
,
params
[
:type
])
commands:
autocomplete
.
commands
(
noteable
,
params
[
:type
])
}
}
...
...
app/services/projects/autocomplete_service.rb
浏览文件 @
6b35c4ad
...
@@ -13,14 +13,7 @@ module Projects
...
@@ -13,14 +13,7 @@ module Projects
end
end
def
labels
def
labels
LabelsFinder
.
new
(
current_user
,
project_id:
project
.
id
).
execute
.
LabelsFinder
.
new
(
current_user
,
project_id:
project
.
id
).
execute
.
select
([
:title
,
:color
])
pluck
(
:title
,
:color
).
map
{
|
l
|
{
title:
l
.
first
,
color:
l
.
second
}
}
end
def
unlabels
(
noteable
)
return
[]
unless
noteable
&&
noteable
.
respond_to?
(
:labels
)
noteable
.
labels
.
pluck
(
:title
,
:color
).
map
{
|
l
|
{
title:
l
.
first
,
color:
l
.
second
}
}
end
end
def
commands
(
noteable
,
type
)
def
commands
(
noteable
,
type
)
...
...
changelogs/unreleased/22680-unlabel-limit-autocomplete-to-selected-items.yml
已删除
100644 → 0
浏览文件 @
11ba759d
---
title
:
Limit autocomplete to currently selected items for unlabel slash command
merge_request
:
22680
author
:
Akram Fares
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录