From d427b946d677c3dca6f51da79ac7173837522fbb Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 13 Jun 2017 13:01:37 +0000 Subject: Merge branch 'fix-github-clone-wiki' into 'master' GitHub - Fix token interpolation when cloning wiki repository See merge request !12107 --- changelogs/unreleased/fix-github-clone-wiki.yml | 4 ++++ lib/github/import.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/fix-github-clone-wiki.yml diff --git a/changelogs/unreleased/fix-github-clone-wiki.yml b/changelogs/unreleased/fix-github-clone-wiki.yml new file mode 100644 index 00000000000..eadd90e1390 --- /dev/null +++ b/changelogs/unreleased/fix-github-clone-wiki.yml @@ -0,0 +1,4 @@ +--- +title: Github - Fix token interpolation when cloning wiki repository +merge_request: +author: diff --git a/lib/github/import.rb b/lib/github/import.rb index 9c7eb965f93..b20614b3060 100644 --- a/lib/github/import.rb +++ b/lib/github/import.rb @@ -92,7 +92,7 @@ module Github end def fetch_wiki_repository - wiki_url = "https://{options.fetch(:token)}@github.com/#{repo}.wiki.git" + wiki_url = "https://#{options.fetch(:token)}@github.com/#{repo}.wiki.git" wiki_path = "#{project.path_with_namespace}.wiki" unless project.wiki.repository_exists? -- cgit v1.2.1