Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e33c3154
Commit
e33c3154
authored
Oct 15, 2019
by
Luke Duncalfe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disallow updating designs if issue locked or moved
https://gitlab.com/gitlab-org/gitlab/issues/13426#note_210926182
parent
ce942cd9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
4 deletions
+35
-4
changelogs/unreleased/13426-disable-design-mutation-abilities-when-issue-moved-or-locked.yml
...-design-mutation-abilities-when-issue-moved-or-locked.yml
+5
-0
doc/user/project/issues/design_management.md
doc/user/project/issues/design_management.md
+3
-0
ee/app/policies/ee/issue_policy.rb
ee/app/policies/ee/issue_policy.rb
+7
-0
ee/spec/policies/design_management/design_policy_spec.rb
ee/spec/policies/design_management/design_policy_spec.rb
+20
-4
No files found.
changelogs/unreleased/13426-disable-design-mutation-abilities-when-issue-moved-or-locked.yml
0 → 100644
View file @
e33c3154
---
title
:
Make designs read-only if the issue has been moved, or if its discussion has been locked
merge_request
:
18551
author
:
type
:
changed
doc/user/project/issues/design_management.md
View file @
e33c3154
...
@@ -63,6 +63,9 @@ To upload design images, click the **Upload Designs** button and select images t
...
@@ -63,6 +63,9 @@ To upload design images, click the **Upload Designs** button and select images t
Designs with the same filename as an existing uploaded design will create a new version
Designs with the same filename as an existing uploaded design will create a new version
of the design, and will replace the previous version.
of the design, and will replace the previous version.
Designs cannot be added if the issue has been moved, or its
[
discussion is locked
](
../../discussions/#lock-discussions
)
.
## Viewing designs
## Viewing designs
Images on the Design Management page can be enlarged by clicking on them.
Images on the Design Management page can be enlarged by clicking on them.
...
...
ee/app/policies/ee/issue_policy.rb
View file @
e33c3154
...
@@ -4,11 +4,18 @@ module EE
...
@@ -4,11 +4,18 @@ module EE
module
IssuePolicy
module
IssuePolicy
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
prepended
do
prepended
do
condition
(
:moved
)
{
@subject
.
moved?
}
rule
{
~
can?
(
:read_issue
)
}.
policy
do
rule
{
~
can?
(
:read_issue
)
}.
policy
do
prevent
:read_design
prevent
:read_design
prevent
:create_design
prevent
:create_design
prevent
:destroy_design
prevent
:destroy_design
end
end
rule
{
locked
|
moved
}.
policy
do
prevent
:create_design
prevent
:destroy_design
end
end
end
end
end
end
end
ee/spec/policies/design_management/design_policy_spec.rb
View file @
e33c3154
...
@@ -94,6 +94,11 @@ describe DesignManagement::DesignPolicy do
...
@@ -94,6 +94,11 @@ describe DesignManagement::DesignPolicy do
end
end
end
end
shared_examples_for
"read-only design abilities"
do
it
{
is_expected
.
to
be_allowed
(
:read_design
)
}
it
{
is_expected
.
to
be_disallowed
(
:create_design
,
:destroy_design
)
}
end
context
"when the feature flag is off"
do
context
"when the feature flag is off"
do
before
do
before
do
stub_licensed_features
(
design_management:
true
)
stub_licensed_features
(
design_management:
true
)
...
@@ -164,6 +169,20 @@ describe DesignManagement::DesignPolicy do
...
@@ -164,6 +169,20 @@ describe DesignManagement::DesignPolicy do
end
end
end
end
context
"when the issue is locked"
do
let
(
:current_user
)
{
owner
}
let
(
:issue
)
{
create
(
:issue
,
:locked
,
project:
project
)
}
it_behaves_like
"read-only design abilities"
end
context
"when the issue has moved"
do
let
(
:current_user
)
{
owner
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
moved_to:
create
(
:issue
))
}
it_behaves_like
"read-only design abilities"
end
context
"when the project is archived"
do
context
"when the project is archived"
do
let
(
:current_user
)
{
owner
}
let
(
:current_user
)
{
owner
}
...
@@ -171,10 +190,7 @@ describe DesignManagement::DesignPolicy do
...
@@ -171,10 +190,7 @@ describe DesignManagement::DesignPolicy do
project
.
update!
(
archived:
true
)
project
.
update!
(
archived:
true
)
end
end
it
"only allows reading designs"
do
it_behaves_like
"read-only design abilities"
expect
(
design_policy
).
to
be_allowed
(
:read_design
)
expect
(
design_policy
).
to
be_disallowed
(
:create_design
,
:destroy_design
)
end
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment