Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ea99abb1
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 搜索 >>
提交
ea99abb1
编写于
2月 11, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
a9104a50
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
136 addition
and
36 deletion
+136
-36
app/assets/javascripts/boards/components/issue_card_inner.vue
...assets/javascripts/boards/components/issue_card_inner.vue
+8
-0
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+1
-0
app/assets/javascripts/lib/utils/http_status.js
app/assets/javascripts/lib/utils/http_status.js
+1
-0
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+4
-0
app/controllers/groups/boards_controller.rb
app/controllers/groups/boards_controller.rb
+5
-0
app/policies/group_policy.rb
app/policies/group_policy.rb
+1
-0
app/services/ci/create_cross_project_pipeline_service.rb
app/services/ci/create_cross_project_pipeline_service.rb
+1
-1
changelogs/unreleased/34723-visually-differentiate-blocked-issues.yml
...nreleased/34723-visually-differentiate-blocked-issues.yml
+5
-0
changelogs/unreleased/35546-child-epic-error-messages.yml
changelogs/unreleased/35546-child-epic-error-messages.yml
+5
-0
changelogs/unreleased/drop-bridge-on-any-pipeline-errors.yml
changelogs/unreleased/drop-bridge-on-any-pipeline-errors.yml
+5
-0
doc/administration/raketasks/project_import_export.md
doc/administration/raketasks/project_import_export.md
+4
-3
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+22
-1
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+5
-5
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+4
-4
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
+0
-0
doc/user/project/issue_board.md
doc/user/project/issue_board.md
+8
-0
doc/user/project/settings/import_export.md
doc/user/project/settings/import_export.md
+19
-15
lib/api/group_boards.rb
lib/api/group_boards.rb
+4
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/controllers/groups/boards_controller_spec.rb
spec/controllers/groups/boards_controller_spec.rb
+7
-3
spec/frontend/boards/issue_card_spec.js
spec/frontend/boards/issue_card_spec.js
+21
-1
spec/policies/group_policy_spec.rb
spec/policies/group_policy_spec.rb
+2
-2
spec/support/shared_contexts/policies/group_policy_shared_context.rb
...t/shared_contexts/policies/group_policy_shared_context.rb
+1
-1
未找到文件。
app/assets/javascripts/boards/components/issue_card_inner.vue
浏览文件 @
ea99abb1
...
...
@@ -161,6 +161,14 @@ export default {
<div>
<div
class=
"d-flex board-card-header"
dir=
"auto"
>
<h4
class=
"board-card-title append-bottom-0 prepend-top-0"
>
<icon
v-if=
"issue.blocked"
v-gl-tooltip
name=
"issue-block"
:title=
"__('Blocked issue')"
class=
"issue-blocked-icon append-right-4"
:aria-label=
"__('Blocked issue')"
/>
<icon
v-if=
"issue.confidential"
v-gl-tooltip
...
...
app/assets/javascripts/boards/models/issue.js
浏览文件 @
ea99abb1
...
...
@@ -37,6 +37,7 @@ class ListIssue {
this
.
project_id
=
obj
.
project_id
;
this
.
timeEstimate
=
obj
.
time_estimate
;
this
.
assignableLabelsEndpoint
=
obj
.
assignable_labels_endpoint
;
this
.
blocked
=
obj
.
blocked
;
if
(
obj
.
project
)
{
this
.
project
=
new
IssueProject
(
obj
.
project
);
...
...
app/assets/javascripts/lib/utils/http_status.js
浏览文件 @
ea99abb1
...
...
@@ -19,6 +19,7 @@ const httpStatusCodes = {
UNAUTHORIZED
:
401
,
FORBIDDEN
:
403
,
NOT_FOUND
:
404
,
CONFLICT
:
409
,
GONE
:
410
,
UNPROCESSABLE_ENTITY
:
422
,
SERVICE_UNAVAILABLE
:
503
,
...
...
app/assets/stylesheets/pages/boards.scss
浏览文件 @
ea99abb1
...
...
@@ -287,6 +287,10 @@
cursor
:
help
;
}
.issue-blocked-icon
{
color
:
$red-500
;
}
@include
media-breakpoint-down
(
md
)
{
padding
:
$gl-padding-8
;
}
...
...
app/controllers/groups/boards_controller.rb
浏览文件 @
ea99abb1
...
...
@@ -4,6 +4,7 @@ class Groups::BoardsController < Groups::ApplicationController
include
BoardsActions
include
RecordUserLastActivity
before_action
:authorize_read_board!
,
only:
[
:index
,
:show
]
before_action
:assign_endpoint_vars
before_action
do
push_frontend_feature_flag
(
:multi_select_board
,
default_enabled:
true
)
...
...
@@ -16,4 +17,8 @@ class Groups::BoardsController < Groups::ApplicationController
@namespace_path
=
group
.
to_param
@labels_endpoint
=
group_labels_url
(
group
)
end
def
authorize_read_board!
access_denied!
unless
can?
(
current_user
,
:read_board
,
group
)
end
end
app/policies/group_policy.rb
浏览文件 @
ea99abb1
...
...
@@ -67,6 +67,7 @@ class GroupPolicy < BasePolicy
enable
:read_milestone
enable
:read_list
enable
:read_label
enable
:read_board
end
rule
{
has_access
}.
enable
:read_namespace
...
...
app/services/ci/create_cross_project_pipeline_service.rb
浏览文件 @
ea99abb1
...
...
@@ -30,7 +30,7 @@ module Ci
end
downstream_pipeline
.
tap
do
|
pipeline
|
@bridge
.
drop!
(
:downstream_pipeline_creation_failed
)
if
pipeline
.
has_yaml_errors
?
@bridge
.
drop!
(
:downstream_pipeline_creation_failed
)
if
pipeline
.
errors
.
any
?
end
end
...
...
changelogs/unreleased/34723-visually-differentiate-blocked-issues.yml
0 → 100644
浏览文件 @
ea99abb1
---
title
:
Add blocked icon on issue board card
merge_request
:
24420
author
:
type
:
added
changelogs/unreleased/35546-child-epic-error-messages.yml
0 → 100644
浏览文件 @
ea99abb1
---
title
:
Improve error messages when adding a child epic
merge_request
:
22688
author
:
type
:
fixed
changelogs/unreleased/drop-bridge-on-any-pipeline-errors.yml
0 → 100644
浏览文件 @
ea99abb1
---
title
:
Drop bridge on any downstream pipeline errors
merge_request
:
24735
author
:
type
:
fixed
doc/administration/raketasks/project_import_export.md
浏览文件 @
ea99abb1
...
...
@@ -32,9 +32,10 @@ bundle exec rake gitlab:import_export:data RAILS_ENV=production
Note the following:
-
Importing is not possible if the version of the import instance is older than that of the exporter.
-
The project import option must be enabled in application settings
(
`/admin/application_settings/general`
) under
**Import sources**
, which is available
-
Importing is only possible if the version of the import and export GitLab instances are
compatible as described in the
[
Version history
](
../../user/project/settings/import_export.md#version-history
)
.
-
The project import option must be enabled in
application settings (
`/admin/application_settings/general`
) under
**Import sources**
, which is available
under
**{admin}**
**Admin Area >**
**{settings}**
**Settings > Visibility and access controls**
.
-
The exports are stored in a temporary
[
shared directory
](
../../development/shared_files.md
)
and are deleted every 24 hours by a specific worker.
doc/api/graphql/reference/gitlab_schema.graphql
浏览文件 @
ea99abb1
...
...
@@ -1986,7 +1986,20 @@ type Epic implements Noteable {
"""
last
:
Int
):
UserConnection
reference
(
full
:
Boolean
=
false
):
String
!
"""
Internal
reference
of
the
epic
.
Returned
in
shortened
format
by
default
"""
reference
(
"""
Indicates
if
the
reference
should
be
returned
in
full
"""
full
:
Boolean
=
false
):
String
!
"""
URI
path
of
the
epic
-
issue
relationship
"""
relationPath
:
String
"""
...
...
@@ -2043,7 +2056,15 @@ type Epic implements Noteable {
Permissions
for
the
current
user
on
the
resource
"""
userPermissions
:
EpicPermissions
!
"""
Web
path
of
the
epic
"""
webPath
:
String
!
"""
Web
URL
of
the
epic
"""
webUrl
:
String
!
}
...
...
doc/api/graphql/reference/gitlab_schema.json
浏览文件 @
ea99abb1
...
...
@@ -5013,11 +5013,11 @@
},
{
"name": "reference",
"description":
null
,
"description":
"Internal reference of the epic. Returned in shortened format by default"
,
"args": [
{
"name": "full",
"description":
null
,
"description":
"Indicates if the reference should be returned in full"
,
"type": {
"kind": "SCALAR",
"name": "Boolean",
...
...
@@ -5040,7 +5040,7 @@
},
{
"name": "relationPath",
"description":
null
,
"description":
"URI path of the epic-issue relationship"
,
"args": [
],
...
...
@@ -5224,7 +5224,7 @@
},
{
"name": "webPath",
"description":
null
,
"description":
"Web path of the epic"
,
"args": [
],
...
...
@@ -5242,7 +5242,7 @@
},
{
"name": "webUrl",
"description":
null
,
"description":
"Web URL of the epic"
,
"args": [
],
...
...
doc/api/graphql/reference/index.md
浏览文件 @
ea99abb1
...
...
@@ -295,8 +295,8 @@ Represents an epic.
|
`id`
| ID! | ID of the epic |
|
`iid`
| ID! | Internal ID of the epic |
|
`parent`
| Epic | Parent epic of the epic |
|
`reference`
| String! | |
|
`relationPath`
| String | |
|
`reference`
| String! |
Internal reference of the epic. Returned in shortened format by default
|
|
`relationPath`
| String |
URI path of the epic-issue relationship
|
|
`relativePosition`
| Int | The relative position of the epic in the epic tree |
|
`startDate`
| Time | Start date of the epic |
|
`startDateFixed`
| Time | Fixed start date of the epic |
...
...
@@ -308,8 +308,8 @@ Represents an epic.
|
`updatedAt`
| Time | Timestamp of the epic's last activity |
|
`upvotes`
| Int! | Number of upvotes the epic has received |
|
`userPermissions`
| EpicPermissions! | Permissions for the current user on the resource |
|
`webPath`
| String! | |
|
`webUrl`
| String! | |
|
`webPath`
| String! |
Web path of the epic
|
|
`webUrl`
| String! |
Web URL of the epic
|
## EpicDescendantCount
...
...
doc/user/project/img/issue_boards_blocked_icon_v12_8.png
0 → 100644
浏览文件 @
ea99abb1
64.8 KB
doc/user/project/issue_board.md
浏览文件 @
ea99abb1
...
...
@@ -303,6 +303,14 @@ Different issue board features are available in different [GitLab tiers](https:/
| Premium / Silver | Multiple | Multiple | Yes | Yes |
| Ultimate / Gold | Multiple | Multiple | Yes | Yes |
## Blocked issues
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34723) in GitLab 12.8.
If an issue is blocked by another issue, an icon will display next to its title to differentiate it from unblocked issues.
![
Blocked issues
](
img/issue_boards_blocked_icon_v12_8.png
)
## Actions you can take on an Issue Board
-
[
Create a new list
](
#creating-a-new-list
)
.
...
...
doc/user/project/settings/import_export.md
浏览文件 @
ea99abb1
...
...
@@ -6,28 +6,30 @@
Existing projects running on any GitLab instance or GitLab.com can be exported with all their related
data and be moved into a new GitLab instance.
The
**GitLab import/export**
button is displayed if the project import option is enabled.
See also:
-
[
Project import/export API
](
../../../api/project_import_export.md
)
.
-
[
Project import/export administration rake tasks
](
../../../administration/raketasks/project_import_export.md
)
.
**(CORE ONLY)**
-
[
Project import/export API
](
../../../api/project_import_export.md
)
-
[
Project import/export administration rake tasks
](
../../../administration/raketasks/project_import_export.md
)
**(CORE ONLY)**
To set up a project import/export:
1.
Navigate to
**{admin}**
**Admin Area >**
**{settings}**
**Settings > Visibility and access controls**
.
1.
Scroll to
**Import sources**
1.
Enable desired
**Import sources**
## Important notes
Note the following:
-
Importing is not possible if the import instance version differs from
that of the exporter.
-
The project import option must be enabled in application settings
(
`/admin/application_settings/general`
) under
**Import sources**
, which is
available under
**{admin}**
**Admin Area >**
**{settings}**
**Settings > Visibility and access controls**
.
Ask your administrator if you don't see the
**GitLab export**
button when
creating a new project.
-
The exports are stored in a temporary
[
shared directory
](
../../../development/shared_files.md
)
-
Imports will fail unless the import and export GitLab instances are
compatible as described in the
[
Version history
](
#version-history
)
.
-
Exports are stored in a temporary
[
shared directory
](
../../../development/shared_files.md
)
and are deleted every 24 hours by a specific worker.
-
Group members are exported as project members, as long as the user has
maintainer or admin access to the group where the exported project lives. An admin
in the import side is required to map the users, based on email.
Otherwise, a supplementary comment is left to mention the original author and
maintainer or admin access to the group where the exported project lives. Import admins should map users by email address.
Otherwise, a supplementary comment is left to mention that the original author and
the MRs, notes, or issues will be owned by the importer.
-
Project members with owner access will be imported as maintainers.
-
If an imported project contains merge requests originating from forks,
...
...
@@ -39,7 +41,7 @@ Note the following:
The following table lists updates to Import/Export:
| GitLab version | Import/Export version |
| GitLab version | Import/Export
schema
version |
| ---------------- | --------------------- |
| 11.1 to current | 0.2.4 |
| 10.8 | 0.2.3 |
...
...
@@ -56,7 +58,9 @@ The following table lists updates to Import/Export:
| 8.9.5 | 0.1.1 |
| 8.9.0 | 0.1.0 |
For example, 8.10.3 and 8.11 will have the same Import/Export version (0.1.3)
Projects can be exported and imported only between versions of GitLab with matching Import/Export versions.
For example, 8.10.3 and 8.11 have the same Import/Export version (0.1.3)
and the exports between them will be compatible.
## Exported contents
...
...
lib/api/group_boards.rb
浏览文件 @
ea99abb1
...
...
@@ -28,6 +28,7 @@ module API
success
::
API
::
Entities
::
Board
end
get
'/:board_id'
do
authorize!
(
:read_board
,
user_group
)
present
board
,
with:
::
API
::
Entities
::
Board
end
...
...
@@ -39,6 +40,7 @@ module API
use
:pagination
end
get
'/'
do
authorize!
(
:read_board
,
user_group
)
present
paginate
(
board_parent
.
boards
.
with_associations
),
with:
Entities
::
Board
end
end
...
...
@@ -55,6 +57,7 @@ module API
use
:pagination
end
get
'/lists'
do
authorize!
(
:read_board
,
user_group
)
present
paginate
(
board_lists
),
with:
Entities
::
List
end
...
...
@@ -66,6 +69,7 @@ module API
requires
:list_id
,
type:
Integer
,
desc:
'The ID of a list'
end
get
'/lists/:list_id'
do
authorize!
(
:read_board
,
user_group
)
present
board_lists
.
find
(
params
[
:list_id
]),
with:
Entities
::
List
end
...
...
locale/gitlab.pot
浏览文件 @
ea99abb1
...
...
@@ -2768,6 +2768,9 @@ msgstr ""
msgid "Blocked"
msgstr ""
msgid "Blocked issue"
msgstr ""
msgid "Blocks"
msgstr ""
...
...
spec/controllers/groups/boards_controller_spec.rb
浏览文件 @
ea99abb1
...
...
@@ -27,7 +27,8 @@ describe Groups::BoardsController do
context
'with unauthorized user'
do
before
do
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_cross_project
,
:global
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
false
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_board
,
group
).
and_return
(
false
)
end
it
'returns a not found 404 response'
do
...
...
@@ -70,7 +71,8 @@ describe Groups::BoardsController do
context
'with unauthorized user'
do
before
do
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_cross_project
,
:global
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
false
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_board
,
group
).
and_return
(
false
)
end
it
'returns a not found 404 response'
do
...
...
@@ -105,7 +107,8 @@ describe Groups::BoardsController do
context
'with unauthorized user'
do
before
do
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_cross_project
,
:global
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
false
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_board
,
group
).
and_return
(
false
)
end
it
'returns a not found 404 response'
do
...
...
@@ -142,6 +145,7 @@ describe Groups::BoardsController do
context
'with unauthorized user'
do
before
do
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_cross_project
,
:global
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
true
)
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:read_group
,
group
).
and_return
(
false
)
end
...
...
spec/frontend/boards/issue_card_spec.js
浏览文件 @
ea99abb1
...
...
@@ -66,7 +66,11 @@ describe('Issue card component', () => {
});
it
(
'
does not render confidential icon
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.fa-eye-flash
'
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
'
.confidential-icon
'
).
exists
()).
toBe
(
false
);
});
it
(
'
does not render blocked icon
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.issue-blocked-icon
'
).
exists
()).
toBe
(
false
);
});
it
(
'
renders confidential icon
'
,
done
=>
{
...
...
@@ -324,4 +328,20 @@ describe('Issue card component', () => {
.
catch
(
done
.
fail
);
});
});
describe
(
'
blocked
'
,
()
=>
{
beforeEach
(
done
=>
{
wrapper
.
setProps
({
issue
:
{
...
wrapper
.
props
(
'
issue
'
),
blocked
:
true
,
},
});
wrapper
.
vm
.
$nextTick
(
done
);
});
it
(
'
renders blocked icon if issue is blocked
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.issue-blocked-icon
'
).
exists
()).
toBe
(
true
);
});
});
});
spec/policies/group_policy_spec.rb
浏览文件 @
ea99abb1
...
...
@@ -438,7 +438,7 @@ describe GroupPolicy do
end
end
context
"create_projects"
do
context
'create_projects'
do
context
'when group has no project creation level set'
do
before_all
do
group
.
update
(
project_creation_level:
nil
)
...
...
@@ -560,7 +560,7 @@ describe GroupPolicy do
end
end
context
"create_subgroup"
do
context
'create_subgroup'
do
context
'when group has subgroup creation level set to owner'
do
before_all
do
group
.
update
(
subgroup_creation_level:
::
Gitlab
::
Access
::
OWNER_SUBGROUP_ACCESS
)
...
...
spec/support/shared_contexts/policies/group_policy_shared_context.rb
浏览文件 @
ea99abb1
...
...
@@ -16,7 +16,7 @@ RSpec.shared_context 'GroupPolicy context' do
read_group_merge_requests
]
end
let
(
:read_group_permissions
)
{
%i[read_label read_list read_milestone]
}
let
(
:read_group_permissions
)
{
%i[read_label read_list read_milestone
read_board
]
}
let
(
:reporter_permissions
)
{
%i[admin_label read_container_image]
}
let
(
:developer_permissions
)
{
[
:admin_milestone
]
}
let
(
:maintainer_permissions
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录