Merge branch 'fix-github-clone-wiki' into 'master'

GitHub - Fix token interpolation when cloning wiki repository See merge request !12107

Merge branch 'fix-github-clone-wiki' into 'master'
0d499ce2 · Sean McGivern · 44b806d0 · c66bcdd9 · 0d499ce2 · 0d499ce2
Commit 0d499ce2 authored Jun 13, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

fix-github-clone-wiki.yml changelogs/unreleased/fix-github-clone-wiki.yml +4 -0

import.rb lib/github/import.rb +1 -1

No files found.
--- a/changelogs/unreleased/fix-github-clone-wiki.yml
+++ b/changelogs/unreleased/fix-github-clone-wiki.yml
+---
+title: Github - Fix token interpolation when cloning wiki repository
+merge_request:
+author:
--- 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?