diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-05 22:27:40 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-11 11:00:01 +0200 |
| commit | fc8214ea8396dfcae21a33eb62524c6ccd36a670 (patch) | |
| tree | 5cab875399336f06b9170d1fbcc47cf844041047 /lib | |
| parent | 1d72f956890e91eec7feac3b7ea9c1a5918ca2f9 (diff) | |
| download | gitlab-ce-fc8214ea8396dfcae21a33eb62524c6ccd36a670.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 |