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
18f80c55
Commit
18f80c55
authored
Apr 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rendering of deleted blocking/blocked-on statuses.
parent
bc2dd5e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
10 deletions
+24
-10
lib/gitlab/google_code_import/importer.rb
lib/gitlab/google_code_import/importer.rb
+24
-10
No files found.
lib/gitlab/google_code_import/importer.rb
View file @
18f80c55
...
@@ -276,11 +276,18 @@ module Gitlab
...
@@ -276,11 +276,18 @@ module Gitlab
if
raw_updates
.
has_key?
(
"blockedOn"
)
if
raw_updates
.
has_key?
(
"blockedOn"
)
blocked_ons
=
raw_updates
[
"blockedOn"
].
map
do
|
raw_blocked_on
|
blocked_ons
=
raw_updates
[
"blockedOn"
].
map
do
|
raw_blocked_on
|
name
,
id
=
raw_blocked_on
.
split
(
":"
,
2
)
name
,
id
=
raw_blocked_on
.
split
(
":"
,
2
)
if
name
==
project
.
import_source
"#
#{
id
}
"
deleted
=
name
.
start_with?
(
"-"
)
else
name
=
name
[
1
..-
1
]
if
deleted
"
#{
project
.
namespace
.
path
}
/
#{
name
}
#
#{
id
}
"
end
text
=
if
name
==
project
.
import_source
"#
#{
id
}
"
else
"
#{
project
.
namespace
.
path
}
/
#{
name
}
#
#{
id
}
"
end
text
=
"~~
#{
text
}
~~"
if
deleted
text
end
end
updates
<<
"*Blocked on:
#{
blocked_ons
.
join
(
", "
)
}
*"
updates
<<
"*Blocked on:
#{
blocked_ons
.
join
(
", "
)
}
*"
end
end
...
@@ -288,11 +295,18 @@ module Gitlab
...
@@ -288,11 +295,18 @@ module Gitlab
if
raw_updates
.
has_key?
(
"blocking"
)
if
raw_updates
.
has_key?
(
"blocking"
)
blockings
=
raw_updates
[
"blocking"
].
map
do
|
raw_blocked_on
|
blockings
=
raw_updates
[
"blocking"
].
map
do
|
raw_blocked_on
|
name
,
id
=
raw_blocked_on
.
split
(
":"
,
2
)
name
,
id
=
raw_blocked_on
.
split
(
":"
,
2
)
if
name
==
project
.
import_source
"#
#{
id
}
"
deleted
=
name
.
start_with?
(
"-"
)
else
name
=
name
[
1
..-
1
]
if
deleted
"
#{
project
.
namespace
.
path
}
/
#{
name
}
#
#{
id
}
"
end
text
=
if
name
==
project
.
import_source
"#
#{
id
}
"
else
"
#{
project
.
namespace
.
path
}
/
#{
name
}
#
#{
id
}
"
end
text
=
"~~
#{
text
}
~~"
if
deleted
text
end
end
updates
<<
"*Blocking:
#{
blockings
.
join
(
", "
)
}
*"
updates
<<
"*Blocking:
#{
blockings
.
join
(
", "
)
}
*"
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