Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ecdd6ffa
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,发现更多精彩内容 >>
提交
ecdd6ffa
编写于
6月 29, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
5631ece6
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
77 addition
and
11 deletion
+77
-11
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+5
-0
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/_issues.html.haml
+13
-8
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+2
-2
spec/features/groups/empty_states_spec.rb
spec/features/groups/empty_states_spec.rb
+2
-0
spec/features/issuables/issuable_list_spec.rb
spec/features/issuables/issuable_list_spec.rb
+3
-1
spec/features/issuables/sorting_list_spec.rb
spec/features/issuables/sorting_list_spec.rb
+4
-0
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+3
-0
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+2
-0
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+1
-0
spec/features/issues/user_filters_issues_spec.rb
spec/features/issues/user_filters_issues_spec.rb
+2
-0
spec/features/issues/user_sees_breadcrumb_links_spec.rb
spec/features/issues/user_sees_breadcrumb_links_spec.rb
+2
-0
spec/features/issues/user_sees_empty_state_spec.rb
spec/features/issues/user_sees_empty_state_spec.rb
+4
-0
spec/features/issues/user_sorts_issues_spec.rb
spec/features/issues/user_sorts_issues_spec.rb
+2
-0
spec/features/issues/user_views_issues_spec.rb
spec/features/issues/user_views_issues_spec.rb
+24
-0
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
...eatures/projects/labels/issues_sorted_by_priority_spec.rb
+4
-0
spec/features/projects/user_sees_sidebar_spec.rb
spec/features/projects/user_sees_sidebar_spec.rb
+4
-0
未找到文件。
app/controllers/projects/issues_controller.rb
浏览文件 @
ecdd6ffa
...
...
@@ -47,6 +47,7 @@ class Projects::IssuesController < Projects::ApplicationController
before_action
do
push_frontend_feature_flag
(
:vue_issuable_sidebar
,
project
.
group
)
push_frontend_feature_flag
(
:tribute_autocomplete
,
@project
)
push_frontend_feature_flag
(
:vue_issuables_list
,
project
)
end
before_action
only: :show
do
...
...
@@ -55,6 +56,10 @@ class Projects::IssuesController < Projects::ApplicationController
push_frontend_feature_flag
(
:confidential_apollo_sidebar
,
@project
)
end
before_action
only: :index
do
push_frontend_feature_flag
(
:scoped_labels
,
@project
)
end
around_action
:allow_gitaly_ref_name_caching
,
only:
[
:discussions
]
respond_to
:html
...
...
app/views/projects/issues/_issues.html.haml
浏览文件 @
ecdd6ffa
-
empty_state_path
=
local_assigns
.
fetch
(
:empty_state_path
,
'shared/empty_states/issues'
)
-
if
Feature
.
enabled?
(
:vue_issuables_list
,
@project
)
.js-issuables-list
{
data:
{
endpoint:
expose_url
(
api_v4_projects_issues_path
(
id:
@project
.
id
)),
'can-bulk-edit'
:
@can_bulk_update
.
to_json
,
'empty-svg-path'
:
image_path
(
'illustrations/issues.svg'
),
'sort-key'
:
@sort
}
}
-
else
-
empty_state_path
=
local_assigns
.
fetch
(
:empty_state_path
,
'shared/empty_states/issues'
)
%ul
.content-list.issues-list.issuable-list
{
class:
(
"manual-ordering"
if
@sort
==
'relative_position'
)
}
=
render
partial:
"projects/issues/issue"
,
collection:
@issues
-
if
@issues
.
blank?
=
render
empty_state_path
%ul
.content-list.issues-list.issuable-list
{
class:
(
"manual-ordering"
if
@sort
==
'relative_position'
)
}
=
render
partial:
"projects/issues/issue"
,
collection:
@issues
-
if
@issues
.
blank?
=
render
empty_state_path
-
if
@issues
.
present?
=
paginate
@issues
,
theme:
"gitlab"
,
total_pages:
@total_pages
-
if
@issues
.
present?
=
paginate
@issues
,
theme:
"gitlab"
,
total_pages:
@total_pages
doc/ci/yaml/README.md
浏览文件 @
ecdd6ffa
...
...
@@ -3628,7 +3628,7 @@ only:
The Docker image to use for the
`release-cli`
must be specified, using the following directive:
```
yaml
image
:
registry.gitlab.com/gitlab-org/release-cli:
stable
image
:
registry.gitlab.com/gitlab-org/release-cli:
latest
```
#### Script
...
...
@@ -3724,7 +3724,7 @@ stages:
release_job
:
stage
:
release
image
:
registry.gitlab.com/gitlab-org/release-cli:
stable
image
:
registry.gitlab.com/gitlab-org/release-cli:
latest
only
:
-
tags
script
:
...
...
spec/features/groups/empty_states_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -7,6 +7,8 @@ RSpec.describe 'Group empty states' do
let
(
:user
)
{
create
(
:group_member
,
:developer
,
user:
create
(
:user
),
group:
group
).
user
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
sign_in
(
user
)
end
...
...
spec/features/issuables/issuable_list_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -2,13 +2,15 @@
require
'spec_helper'
RSpec
.
describe
'issuable list'
do
RSpec
.
describe
'issuable list'
,
:js
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
issuable_types
=
[
:issue
,
:merge_request
]
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
# something is going on
project
.
add_user
(
user
,
:developer
)
sign_in
(
user
)
issuable_types
.
each
{
|
type
|
create_issuables
(
type
)
}
...
...
spec/features/issuables/sorting_list_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -10,6 +10,10 @@ RSpec.describe 'Sort Issuable List' do
let
(
:first_updated_issuable
)
{
issuables
.
order_updated_asc
.
first
}
let
(
:last_updated_issuable
)
{
issuables
.
order_updated_desc
.
first
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
context
'for merge requests'
do
include
MergeRequestHelpers
...
...
spec/features/issues/bulk_assignment_labels_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -13,6 +13,9 @@ RSpec.describe 'Issues > Labels bulk assignment' do
context
'as an allowed user'
,
:js
do
before
do
# Make sure that issuables list FF is not turned on.
stub_feature_flags
(
vue_issuables_list:
false
)
project
.
add_maintainer
(
user
)
sign_in
user
...
...
spec/features/issues/filtered_search/filter_issues_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -26,6 +26,8 @@ RSpec.describe 'Filter issues', :js do
end
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
project
.
add_maintainer
(
user
)
create
(
:issue
,
project:
project
,
author:
user2
,
title:
"Bug report 1"
)
...
...
spec/features/issues/update_issues_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -8,6 +8,7 @@ RSpec.describe 'Multiple issue updating from issues#index', :js do
let!
(
:user
)
{
create
(
:user
)}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
end
...
...
spec/features/issues/user_filters_issues_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -7,6 +7,8 @@ RSpec.describe 'User filters issues' do
let_it_be
(
:project
)
{
create
(
:project_empty_repo
,
:public
)
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
%w[foobar barbaz]
.
each
do
|
title
|
create
(
:issue
,
author:
user
,
...
...
spec/features/issues/user_sees_breadcrumb_links_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -7,6 +7,8 @@ RSpec.describe 'New issue breadcrumb' do
let
(
:user
)
{
project
.
creator
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
sign_in
(
user
)
visit
(
new_project_issue_path
(
project
))
end
...
...
spec/features/issues/user_sees_empty_state_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -6,6 +6,10 @@ RSpec.describe 'Issues > User sees empty state' do
let_it_be
(
:project
)
{
create
(
:project
,
:public
)
}
let_it_be
(
:user
)
{
project
.
creator
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
shared_examples_for
'empty state with filters'
do
it
'user sees empty state with filters'
do
create
(
:issue
,
author:
user
,
project:
project
)
...
...
spec/features/issues/user_sorts_issues_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -16,6 +16,8 @@ RSpec.describe "User sorts issues" do
let_it_be
(
:later_due_milestone
)
{
create
(
:milestone
,
project:
project
,
due_date:
'2013-12-12'
)
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
create_list
(
:award_emoji
,
2
,
:upvote
,
awardable:
issue1
)
create_list
(
:award_emoji
,
2
,
:downvote
,
awardable:
issue2
)
create
(
:award_emoji
,
:downvote
,
awardable:
issue1
)
...
...
spec/features/issues/user_views_issues_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -9,6 +9,10 @@ RSpec.describe "User views issues" do
let_it_be
(
:user
)
{
create
(
:user
)
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
shared_examples
"opens issue from list"
do
it
"opens issue"
do
click_link
(
issue
.
title
)
...
...
@@ -116,4 +120,24 @@ RSpec.describe "User views issues" do
context
"when not signed in"
do
include_examples
"public project"
end
context
'when vue_issuables_list feature is enabled'
,
:js
do
before
do
stub_feature_flags
(
vue_issuables_list:
true
)
end
context
'when signed in'
do
before
do
project
.
add_developer
(
user
)
sign_in
(
user
)
end
include_examples
"public project"
include_examples
"internal project"
end
context
'when not signed in'
do
include_examples
"public project"
end
end
end
spec/features/projects/labels/issues_sorted_by_priority_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -13,6 +13,10 @@ RSpec.describe 'Issue prioritization' do
let
(
:label_4
)
{
create
(
:label
,
title:
'label_4'
,
project:
project
,
priority:
4
)
}
let
(
:label_5
)
{
create
(
:label
,
title:
'label_5'
,
project:
project
)
}
# no priority
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
# According to https://gitlab.com/gitlab-org/gitlab-foss/issues/14189#note_4360653
context
'when issues have one label'
do
it
'Are sorted properly'
do
...
...
spec/features/projects/user_sees_sidebar_spec.rb
浏览文件 @
ecdd6ffa
...
...
@@ -6,6 +6,10 @@ RSpec.describe 'Projects > User sees sidebar' do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:private
,
public_builds:
false
,
namespace:
user
.
namespace
)
}
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
end
# NOTE: See documented behaviour https://design.gitlab.com/regions/navigation#contextual-navigation
context
'on different viewports'
,
:js
do
include
MobileHelpers
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录