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
Jérome Perrin
gitlab-ce
Commits
b49bd4d3
Commit
b49bd4d3
authored
7 years ago
by
Grzegorz Bizon
Committed by
Rémy Coutable
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rewriting issue references with group milestones
parent
d247841b
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
77 additions
and
24 deletions
+77
-24
app/models/milestone.rb
app/models/milestone.rb
+5
-3
changelogs/unreleased/fix-gb-fix-moving-issue-with-ambiguous-references.yml
...sed/fix-gb-fix-moving-issue-with-ambiguous-references.yml
+5
-0
lib/gitlab/gfm/reference_rewriter.rb
lib/gitlab/gfm/reference_rewriter.rb
+6
-0
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+1
-1
spec/lib/gitlab/gfm/reference_rewriter_spec.rb
spec/lib/gitlab/gfm/reference_rewriter_spec.rb
+47
-14
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+10
-5
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+3
-1
No files found.
app/models/milestone.rb
View file @
b49bd4d3
...
...
@@ -162,9 +162,7 @@ class Milestone < ActiveRecord::Base
# Milestone.first.to_reference(cross_namespace_project) # => "gitlab-org/gitlab-ce%1"
# Milestone.first.to_reference(same_namespace_project) # => "gitlab-ce%1"
#
def
to_reference
(
from_project
=
nil
,
format: :iid
,
full:
false
)
return
if
group_milestone?
&&
format
!=
:name
def
to_reference
(
from_project
=
nil
,
format: :name
,
full:
false
)
format_reference
=
milestone_format_reference
(
format
)
reference
=
"
#{
self
.
class
.
reference_prefix
}#{
format_reference
}
"
...
...
@@ -241,6 +239,10 @@ class Milestone < ActiveRecord::Base
def
milestone_format_reference
(
format
=
:iid
)
raise
ArgumentError
,
'Unknown format'
unless
[
:iid
,
:name
].
include?
(
format
)
if
group_milestone?
&&
format
==
:iid
raise
ArgumentError
,
'Cannot refer to a group milestone by an internal id!'
end
if
format
==
:name
&&
!
name
.
include?
(
'"'
)
%("#{name}")
else
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/fix-gb-fix-moving-issue-with-ambiguous-references.yml
0 → 100644
View file @
b49bd4d3
---
title
:
Fix errors when moving issue with reference to a group milestone
merge_request
:
14294
author
:
type
:
fixed
This diff is collapsed.
Click to expand it.
lib/gitlab/gfm/reference_rewriter.rb
View file @
b49bd4d3
...
...
@@ -29,6 +29,8 @@ module Gitlab
# http://gitlab.com/some/link/#1234, and code `puts #1234`'
#
class
ReferenceRewriter
RewriteError
=
Class
.
new
(
StandardError
)
def
initialize
(
text
,
source_project
,
current_user
)
@text
=
text
@source_project
=
source_project
...
...
@@ -61,6 +63,10 @@ module Gitlab
cross_reference
=
build_cross_reference
(
referable
,
target_project
)
return
reference
if
reference
==
cross_reference
if
cross_reference
.
nil?
raise
RewriteError
,
"Unspecified reference detected for
#{
referable
.
class
.
name
}
"
end
new_text
=
before
+
cross_reference
+
after
substitution_valid?
(
new_text
)
?
cross_reference
:
reference
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
View file @
b49bd4d3
...
...
@@ -296,7 +296,7 @@ describe Banzai::Filter::MilestoneReferenceFilter do
context
'project milestones'
do
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
let
(
:reference
)
{
milestone
.
to_reference
}
let
(
:reference
)
{
milestone
.
to_reference
(
format: :iid
)
}
include_examples
'reference parsing'
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/gfm/reference_rewriter_spec.rb
View file @
b49bd4d3
require
'spec_helper'
describe
Gitlab
::
Gfm
::
ReferenceRewriter
do
let
(
:
text
)
{
'some text'
}
let
(
:old_project
)
{
create
(
:project
,
name:
'old-project'
)
}
let
(
:new_project
)
{
create
(
:project
,
name:
'new-project'
)
}
let
(
:
group
)
{
create
(
:group
)
}
let
(
:old_project
)
{
create
(
:project
,
name:
'old-project'
,
group:
group
)
}
let
(
:new_project
)
{
create
(
:project
,
name:
'new-project'
,
group:
group
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:old_project_ref
)
{
old_project
.
to_reference
(
new_project
)
}
let
(
:text
)
{
'some text'
}
before
do
old_project
.
team
<<
[
user
,
:reporter
]
end
...
...
@@ -39,7 +42,7 @@ describe Gitlab::Gfm::ReferenceRewriter do
it
{
is_expected
.
not_to
include
merge_request
.
to_reference
(
new_project
)
}
end
context
'
description ambigous element
s'
do
context
'
rewrite ambigous reference
s'
do
context
'url'
do
let
(
:url
)
{
'http://gitlab.com/#1'
}
let
(
:text
)
{
"This references #1, but not
#{
url
}
"
}
...
...
@@ -66,23 +69,21 @@ describe Gitlab::Gfm::ReferenceRewriter do
context
'description with project labels'
do
let!
(
:label
)
{
create
(
:label
,
id:
123
,
name:
'test'
,
project:
old_project
)
}
let
(
:project_ref
)
{
old_project
.
to_reference
(
new_project
)
}
context
'label referenced by id'
do
let
(
:text
)
{
'#1 and ~123'
}
it
{
is_expected
.
to
eq
%Q{
#{
project_ref
}
#1 and
#{
project_ref
}
~123}
}
it
{
is_expected
.
to
eq
%Q{
#{
old_project_ref
}
#1 and
#{
old_
project_ref
}
~123}
}
end
context
'label referenced by text'
do
let
(
:text
)
{
'#1 and ~"test"'
}
it
{
is_expected
.
to
eq
%Q{
#{
project_ref
}
#1 and
#{
project_ref
}
~123}
}
it
{
is_expected
.
to
eq
%Q{
#{
old_project_ref
}
#1 and
#{
old_
project_ref
}
~123}
}
end
end
context
'description with group labels'
do
let
(
:old_group
)
{
create
(
:group
)
}
let!
(
:group_label
)
{
create
(
:group_label
,
id:
321
,
name:
'group label'
,
group:
old_group
)
}
let
(
:project_ref
)
{
old_project
.
to_reference
(
new_project
)
}
before
do
old_project
.
update
(
namespace:
old_group
)
...
...
@@ -90,21 +91,53 @@ describe Gitlab::Gfm::ReferenceRewriter do
context
'label referenced by id'
do
let
(
:text
)
{
'#1 and ~321'
}
it
{
is_expected
.
to
eq
%Q{
#{
project_ref
}
#1 and
#{
project_ref
}
~321}
}
it
{
is_expected
.
to
eq
%Q{
#{
old_project_ref
}
#1 and
#{
old_
project_ref
}
~321}
}
end
context
'label referenced by text'
do
let
(
:text
)
{
'#1 and ~"group label"'
}
it
{
is_expected
.
to
eq
%Q{
#{
project_ref
}
#1 and
#{
project_ref
}
~321}
}
it
{
is_expected
.
to
eq
%Q{
#{
old_project_ref
}
#1 and
#{
old_
project_ref
}
~321}
}
end
end
end
end
context
'reference contains project milestone'
do
let!
(
:milestone
)
do
create
(
:milestone
,
title:
'9.0'
,
project:
old_project
)
end
let
(
:text
)
{
'milestone: %"9.0"'
}
it
{
is_expected
.
to
eq
%Q[milestone:
#{
old_project_ref
}
%"9.0"]
}
end
context
'when referring to group milestone'
do
let!
(
:milestone
)
do
create
(
:milestone
,
title:
'10.0'
,
group:
group
)
end
let
(
:text
)
{
'milestone %"10.0"'
}
it
{
is_expected
.
to
eq
text
}
end
context
'when referable has a nil reference'
do
before
do
create
(
:milestone
,
title:
'9.0'
,
project:
old_project
)
allow_any_instance_of
(
Milestone
)
.
to
receive
(
:to_reference
)
.
and_return
(
nil
)
end
context
'reference contains milestone'
do
let
(
:milestone
)
{
create
(
:milestone
)
}
let
(
:text
)
{
"milestone ref:
#{
milestone
.
to_reference
}
"
}
let
(
:text
)
{
'milestone: %"9.0"'
}
it
{
is_expected
.
to
eq
text
}
it
'raises an error that should be fixed'
do
expect
{
subject
}.
to
raise_error
(
described_class
::
RewriteError
,
'Unspecified reference detected for Milestone'
)
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/models/milestone_spec.rb
View file @
b49bd4d3
...
...
@@ -238,7 +238,7 @@ describe Milestone do
let
(
:milestone
)
{
build_stubbed
(
:milestone
,
iid:
1
,
project:
project
,
name:
'milestone'
)
}
it
'returns a String reference to the object'
do
expect
(
milestone
.
to_reference
).
to
eq
'%
1
'
expect
(
milestone
.
to_reference
).
to
eq
'%
"milestone"
'
end
it
'returns a reference by name when the format is set to :name'
do
...
...
@@ -246,24 +246,29 @@ describe Milestone do
end
it
'supports a cross-project reference'
do
expect
(
milestone
.
to_reference
(
another_project
)).
to
eq
'sample-project%
1
'
expect
(
milestone
.
to_reference
(
another_project
)).
to
eq
'sample-project%
"milestone"
'
end
end
context
'for a group milestone'
do
let
(
:milestone
)
{
build_stubbed
(
:milestone
,
iid:
1
,
group:
group
,
name:
'milestone'
)
}
it
'returns
nil with the
default format'
do
expect
(
milestone
.
to_reference
).
to
be_nil
it
'returns
a group milestone reference with a
default format'
do
expect
(
milestone
.
to_reference
).
to
eq
'%"milestone"'
end
it
'returns a reference by name when the format is set to :name'
do
expect
(
milestone
.
to_reference
(
format: :name
)).
to
eq
'%"milestone"'
end
it
'does
not supports cross-project references
'
do
it
'does
supports cross-project references within a group
'
do
expect
(
milestone
.
to_reference
(
another_project
,
format: :name
)).
to
eq
'%"milestone"'
end
it
'raises an error when using iid format'
do
expect
{
milestone
.
to_reference
(
format: :iid
)
}
.
to
raise_error
(
ArgumentError
,
'Cannot refer to a group milestone by an internal id!'
)
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/services/system_note_service_spec.rb
View file @
b49bd4d3
...
...
@@ -232,7 +232,9 @@ describe SystemNoteService do
context
'when milestone added'
do
it
'sets the note text'
do
expect
(
subject
.
note
).
to
eq
"changed milestone to
#{
milestone
.
to_reference
}
"
reference
=
milestone
.
to_reference
(
format: :iid
)
expect
(
subject
.
note
).
to
eq
"changed milestone to
#{
reference
}
"
end
end
...
...
This diff is collapsed.
Click to expand it.
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