diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-05 22:27:40 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-05 22:27:40 +0000 |
| commit | 4fce876542365baa1d79fa7812d343afd498904a (patch) | |
| tree | 50696eeb51edc2837a0718b17adc96195fc2afb6 /lib | |
| parent | 9864b2dbc5d7b6dddc8a41a8ee51391334801961 (diff) | |
| parent | 9a9681772c3c8a6523bb94e758655e5c555cea91 (diff) | |
| download | gitlab-ce-4fce876542365baa1d79fa7812d343afd498904a.tar.gz | |
Merge branch 'fix/import-url-issues' into 'master'
Fix importer bug when throwing exceptions
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15681
See merge request !3941
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/bitbucket_import/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb index 9bb507b5edd..9b83292ef33 100644 --- a/lib/gitlab/bitbucket_import/client.rb +++ b/lib/gitlab/bitbucket_import/client.rb @@ -12,7 +12,7 @@ module Gitlab token_secret = import_data_credentials[:bb_session][:bitbucket_access_token_secret] new(token, token_secret) else - raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}" + raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{project.id}" end end |