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

Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
62f51853 · Rémy Coutable · 1217b5b4 · fc170baf · 62f51853 · 62f51853
Commit 62f51853 authored Mar 02, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

importer.rb lib/gitlab/gitlab_import/importer.rb +1 -1

No files found.
--- 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

--- 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)