Commit 62f51853 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 1217b5b4 fc170baf
...@@ -14,6 +14,7 @@ v 8.5.2 ...@@ -14,6 +14,7 @@ v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px - Fix sidebar overlapping content when screen width was below 1200px
- Fix error 500 when commenting on a commit - Fix error 500 when commenting on a commit
- Fix broken icons on installations with relative URL (Artem Sidorenko) - 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) - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
v 8.5.1 v 8.5.1
......
...@@ -12,7 +12,7 @@ module Gitlab ...@@ -12,7 +12,7 @@ module Gitlab
end end
def execute def execute
project_identifier = CGI.escape(project.import_source, '/') project_identifier = CGI.escape(project.import_source)
#Issues && Comments #Issues && Comments
issues = client.issues(project_identifier) issues = client.issues(project_identifier)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment