diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-14 09:07:19 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-11 12:50:13 +0000 |
| commit | f69066a2367d934a8ccb19e8981a69e917b0f598 (patch) | |
| tree | b9f5bc8e2809e9390878ed7a47cb1240a27f2922 | |
| parent | 657d5085256165ceaeb443891f8e14eeba82aaba (diff) | |
| download | gitlab-ce-f69066a2367d934a8ccb19e8981a69e917b0f598.tar.gz | |
Merge branch '57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid' into 'master'
Resolve "Gitlab Project import fails: sidekiq undefined method import_jid"
Closes #57579
See merge request gitlab-org/gitlab-ce!25239
(cherry picked from commit c06ebe511700f25a61b4dfaa518fbed7667c6876)
401a3bca Fix import_jid error on project import
3 files changed, 16 insertions, 1 deletions
diff --git a/changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml b/changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml new file mode 100644 index 00000000000..f7d6a6c4863 --- /dev/null +++ b/changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml @@ -0,0 +1,5 @@ +--- +title: Fix import_jid error on project import +merge_request: 25239 +author: +type: fixed diff --git a/lib/gitlab/import_export/shared.rb b/lib/gitlab/import_export/shared.rb index 947caaaefee..725c1101d70 100644 --- a/lib/gitlab/import_export/shared.rb +++ b/lib/gitlab/import_export/shared.rb @@ -61,7 +61,7 @@ module Gitlab def log_base_data { importer: 'Import/Export', - import_jid: @project&.import_state&.import_jid, + import_jid: @project&.import_state&.jid, project_id: @project&.id, project_path: @project&.full_path } diff --git a/spec/lib/gitlab/import_export/shared_spec.rb b/spec/lib/gitlab/import_export/shared_spec.rb index f2d750c6595..2c288cff6ef 100644 --- a/spec/lib/gitlab/import_export/shared_spec.rb +++ b/spec/lib/gitlab/import_export/shared_spec.rb @@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do expect(subject.errors).to eq(['Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]']) end + it 'updates the import JID' do + import_state = create(:import_state, project: project, jid: 'jid-test') + + expect_next_instance_of(Gitlab::Import::Logger) do |logger| + expect(logger).to receive(:error).with(hash_including(import_jid: import_state.jid)) + end + + subject.error(error) + end + it 'calls the error logger with the full message' do expect(subject).to receive(:log_error).with(hash_including(message: error.message)) |