Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'

Fix import from gitlab.com fails

_Originally opened at !2896 by @kazsw._

- - -

Fixes #12652

CGI.escape encodes '/' by default.
Second argument can be removed.

See merge request !2988

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 97e6689e78a..f635b49c5b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.5.2
   - Bring the "branded appearance" feature from EE to CE
   - Fix error 500 when commenting on a commit
   - Fix broken icons on installations with relative URL (Artem Sidorenko)
+  - Fix import from gitlab.com (KazSawada)
   - Improve implementation to check read access to forks and add pagination
   - Don't show any "2FA required" message if it's not actually required
   - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
@@ -24,7 +25,7 @@ v 8.5.1
   - Fix error 500 when trying to mark an already done todo as "done"
   - Fix an issue where MRs weren't sortable
   - Issues can now be dragged & dropped into empty milestone lists. This is also
-  possible with MRs
+    possible with MRs
   - Changed padding & background color for highlighted notes
   - Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
   - Update sentry-raven gem to 0.15.6
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)