diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-14 12:07:19 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-11 15:50:13 +0300 |
| commit | f69066a2367d934a8ccb19e8981a69e917b0f598 (patch) | |
| tree | b9f5bc8e2809e9390878ed7a47cb1240a27f2922 /lib | |
| parent | 657d5085256165ceaeb443891f8e14eeba82aaba (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/shared.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |