diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-13 13:01:37 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-16 11:52:56 -0500 |
| commit | 563a8df70cdeb16f7c88e13c6862a47ea0f57e8f (patch) | |
| tree | b0d2d55db2faff28edf922c8fcd6c21c1f47f858 | |
| parent | 21816932f6134d931f5252019d911d564e5001a4 (diff) | |
| download | gitlab-ce-563a8df70cdeb16f7c88e13c6862a47ea0f57e8f.tar.gz | |
Merge branch 'fix-github-clone-wiki' into 'master'
GitHub - Fix token interpolation when cloning wiki repository
See merge request !12107
| -rw-r--r-- | changelogs/unreleased/fix-github-clone-wiki.yml | 4 | ||||
| -rw-r--r-- | lib/github/import.rb | 2 |
2 files changed, 5 insertions, 1 deletions
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? |