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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
8501e13b
Commit
8501e13b
authored
Aug 30, 2019
by
Juliette de Rancourt
Committed by
Jan Provaznik
Aug 30, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Use "moved" instead of "closed" in issue references"
parent
770a15b0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
2 deletions
+23
-2
app/models/issue.rb
app/models/issue.rb
+1
-1
changelogs/unreleased/66264-moved-issue-reference.yml
changelogs/unreleased/66264-moved-issue-reference.yml
+5
-0
lib/banzai/filter/issuable_state_filter.rb
lib/banzai/filter/issuable_state_filter.rb
+6
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/lib/banzai/filter/issuable_state_filter_spec.rb
spec/lib/banzai/filter/issuable_state_filter_spec.rb
+8
-0
No files found.
app/models/issue.rb
View file @
8501e13b
...
@@ -178,7 +178,7 @@ class Issue < ApplicationRecord
...
@@ -178,7 +178,7 @@ class Issue < ApplicationRecord
end
end
def
moved?
def
moved?
!
moved_to
.
nil?
!
moved_to
_id
.
nil?
end
end
def
can_move?
(
user
,
to_project
=
nil
)
def
can_move?
(
user
,
to_project
=
nil
)
...
...
changelogs/unreleased/66264-moved-issue-reference.yml
0 → 100644
View file @
8501e13b
---
title
:
Use moved instead of closed in issue references
merge_request
:
32277
author
:
juliette-derancourt
type
:
changed
lib/banzai/filter/issuable_state_filter.rb
View file @
8501e13b
...
@@ -21,7 +21,8 @@ module Banzai
...
@@ -21,7 +21,8 @@ module Banzai
next
if
!
can_read_cross_project?
&&
cross_reference?
(
issuable
)
next
if
!
can_read_cross_project?
&&
cross_reference?
(
issuable
)
if
VISIBLE_STATES
.
include?
(
issuable
.
state
)
&&
issuable_reference?
(
node
.
inner_html
,
issuable
)
if
VISIBLE_STATES
.
include?
(
issuable
.
state
)
&&
issuable_reference?
(
node
.
inner_html
,
issuable
)
node
.
content
+=
" (
#{
issuable
.
state
}
)"
state
=
moved_issue?
(
issuable
)
?
s_
(
"IssuableStatus|moved"
)
:
issuable
.
state
node
.
content
+=
" (
#{
state
}
)"
end
end
end
end
...
@@ -30,6 +31,10 @@ module Banzai
...
@@ -30,6 +31,10 @@ module Banzai
private
private
def
moved_issue?
(
issuable
)
issuable
.
instance_of?
(
Issue
)
&&
issuable
.
moved?
end
def
issuable_reference?
(
text
,
issuable
)
def
issuable_reference?
(
text
,
issuable
)
CGI
.
unescapeHTML
(
text
)
==
issuable
.
reference_link_text
(
project
||
group
)
CGI
.
unescapeHTML
(
text
)
==
issuable
.
reference_link_text
(
project
||
group
)
end
end
...
...
locale/gitlab.pot
View file @
8501e13b
...
@@ -6191,6 +6191,9 @@ msgstr ""
...
@@ -6191,6 +6191,9 @@ msgstr ""
msgid "IssuableStatus|Closed (%{moved_link_start}moved%{moved_link_end})"
msgid "IssuableStatus|Closed (%{moved_link_start}moved%{moved_link_end})"
msgstr ""
msgstr ""
msgid "IssuableStatus|moved"
msgstr ""
msgid "Issue"
msgid "Issue"
msgstr ""
msgstr ""
...
...
spec/lib/banzai/filter/issuable_state_filter_spec.rb
View file @
8501e13b
...
@@ -131,6 +131,14 @@ describe Banzai::Filter::IssuableStateFilter do
...
@@ -131,6 +131,14 @@ describe Banzai::Filter::IssuableStateFilter do
expect
(
doc
.
css
(
'a'
).
last
.
text
).
to
eq
(
"
#{
closed_issue
.
to_reference
}
(closed)"
)
expect
(
doc
.
css
(
'a'
).
last
.
text
).
to
eq
(
"
#{
closed_issue
.
to_reference
}
(closed)"
)
end
end
it
'appends state to moved issue references'
do
moved_issue
=
create
(
:issue
,
:closed
,
project:
project
,
moved_to:
create_issue
(
:opened
))
link
=
create_link
(
moved_issue
.
to_reference
,
issue:
moved_issue
.
id
,
reference_type:
'issue'
)
doc
=
filter
(
link
,
context
)
expect
(
doc
.
css
(
'a'
).
last
.
text
).
to
eq
(
"
#{
moved_issue
.
to_reference
}
(moved)"
)
end
end
end
context
'for merge request references'
do
context
'for merge request references'
do
...
...
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