summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuki Sawada <kazuki@6715.jp>2016-02-20 00:30:12 +0900
committerRémy Coutable <remy@rymai.me>2016-03-02 10:35:44 +0100
commitfc170baf3f3594e5179ac613099826ee04c99d3f (patch)
tree3af948e6f39cfe155209c2f764ee8ee8588109ff
parent1217b5b489f72bbbb6df5103c8fc79978ef1fdc7 (diff)
downloadgitlab-ce-fc170baf3f3594e5179ac613099826ee04c99d3f.tar.gz
Fix import from gitlab.com
Fixes #12652
-rw-r--r--CHANGELOG1
-rw-r--r--lib/gitlab/gitlab_import/importer.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b7e88d47a01..ae9b25fd7bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
- Fix error 500 when commenting on a commit
- Fix broken icons on installations with relative URL (Artem Sidorenko)
+ - Fix import from gitlab.com (KazSawada)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
v 8.5.1
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 59926084d07..850b73244c6 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -12,7 +12,7 @@ module Gitlab
end
def execute
- project_identifier = CGI.escape(project.import_source, '/')
+ project_identifier = CGI.escape(project.import_source)
#Issues && Comments
issues = client.issues(project_identifier)