summaryrefslogtreecommitdiff
path: root/lib/gitlab/google_code_import/importer.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-21 10:32:29 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-21 10:32:29 +0200
commit18f80c55600e485c87d23afccd82b4947e27ff17 (patch)
treeda01e60da8a83d7fc4beb442bd89d041c619bef9 /lib/gitlab/google_code_import/importer.rb
parentbc2dd5e772dea3ec78462441413842f9fe82165a (diff)
downloadgitlab-ce-18f80c55600e485c87d23afccd82b4947e27ff17.tar.gz
Fix rendering of deleted blocking/blocked-on statuses.
Diffstat (limited to 'lib/gitlab/google_code_import/importer.rb')
-rw-r--r--lib/gitlab/google_code_import/importer.rb34
1 files changed, 24 insertions, 10 deletions
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index caa57f557c0..532689bca6c 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -276,11 +276,18 @@ module Gitlab
if raw_updates.has_key?("blockedOn")
blocked_ons = raw_updates["blockedOn"].map do |raw_blocked_on|
name, id = raw_blocked_on.split(":", 2)
- if name == project.import_source
- "##{id}"
- else
- "#{project.namespace.path}/#{name}##{id}"
- end
+
+ deleted = name.start_with?("-")
+ name = name[1..-1] if deleted
+
+ text =
+ if name == project.import_source
+ "##{id}"
+ else
+ "#{project.namespace.path}/#{name}##{id}"
+ end
+ text = "~~#{text}~~" if deleted
+ text
end
updates << "*Blocked on: #{blocked_ons.join(", ")}*"
end
@@ -288,11 +295,18 @@ module Gitlab
if raw_updates.has_key?("blocking")
blockings = raw_updates["blocking"].map do |raw_blocked_on|
name, id = raw_blocked_on.split(":", 2)
- if name == project.import_source
- "##{id}"
- else
- "#{project.namespace.path}/#{name}##{id}"
- end
+
+ deleted = name.start_with?("-")
+ name = name[1..-1] if deleted
+
+ text =
+ if name == project.import_source
+ "##{id}"
+ else
+ "#{project.namespace.path}/#{name}##{id}"
+ end
+ text = "~~#{text}~~" if deleted
+ text
end
updates << "*Blocking: #{blockings.join(", ")}*"
end