diff options
| author | Kazuki Sawada <kazuki@6715.jp> | 2016-02-20 00:30:12 +0900 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-01 10:01:46 +0100 |
| commit | 065681406331f5676b561b83cae7bdd5b4f7dca6 (patch) | |
| tree | 849d3bc136504ad419ec001f6eba78333de1d39f | |
| parent | 581da235bfcf9fbd6442fd746a1e5a7a9901c927 (diff) | |
| download | gitlab-ce-fix/12652-omniauth-import-from-gitlab-com-fails.tar.gz | |
Fix import from gitlab.comfix/12652-omniauth-import-from-gitlab-com-fails
Fixes #12652
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/gitlab_import/importer.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index d3e28dcfc76..0503147bc4c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.6.0 (unreleased) v 8.5.2 - Fix sidebar overlapping content when screen width was below 1200px - Fix error 500 when commenting on a commit + - Fix import from gitlab.com (KazSawada) v 8.5.1 - Fix group projects styles 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) |