diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-04-22 12:43:10 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-04-26 21:00:55 -0700 |
| commit | eede0323453190440a8d738b5eab0723f54dee65 (patch) | |
| tree | fd54471c6ed4bf76a0c02404dc3f0918bb3ccdb6 /spec/controllers/import | |
| parent | c01ff1f54b55a60f7c7473d0d8a429d5cf9c1609 (diff) | |
| download | gitlab-ce-eede0323453190440a8d738b5eab0723f54dee65.tar.gz | |
Backport GitHub Enterprise import support from EE
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.
One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
Diffstat (limited to 'spec/controllers/import')
| -rw-r--r-- | spec/controllers/import/github_controller_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index bbf8adef534..bcc713dce2a 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -22,6 +22,8 @@ describe Import::GithubController do token = "asdasd12345" allow_any_instance_of(Gitlab::GithubImport::Client). to receive(:get_token).and_return(token) + allow_any_instance_of(Gitlab::GithubImport::Client). + to receive(:github_options).and_return({}) stub_omniauth_provider('github') get :callback |