kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-github-import' into 'master' 

Fix token interpolation when setting the Github remote

See merge request !11311
This commit is contained in:
Douwe Maan 2017-05-15 14:26:39 +00:00
parent db46475821 851a8b1f73
commit 915f1bcdaf
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/unreleased/fix-github-import.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix token interpolation when setting the Github remote
merge_request:
author:

5
lib/github/import.rb
View File

@ -1,4 +1,5 @@
require_relative 'error'
module Github
class Import
include Gitlab::ShellAdapter
@ -6,6 +7,7 @@ module Github
class MergeRequest < ::MergeRequest
self.table_name = 'merge_requests'
self.reset_callbacks :create
self.reset_callbacks :save
self.reset_callbacks :commit
self.reset_callbacks :update
@ -16,6 +18,7 @@ module Github
self.table_name = 'issues'
self.reset_callbacks :save
self.reset_callbacks :create
self.reset_callbacks :commit
self.reset_callbacks :update
self.reset_callbacks :validate
@ -79,7 +82,7 @@ module Github
def fetch_repository
begin
project.create_repository unless project.repository.exists?
project.repository.add_remote('github', "https://{options.fetch(:token)}@github.com/#{repo}.git")
project.repository.add_remote('github', "https://#{options.fetch(:token)}@github.com/#{repo}.git")
project.repository.set_remote_as_mirror('github')
project.repository.fetch_remote('github', forced: true)
rescue Gitlab::Shell::Error => e