diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 12:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 12:09:34 +0300 |
| commit | 97f0ae7454597105a27df65ffb772949d9d4f3cb (patch) | |
| tree | 0bf4888e0e9082c8f168a211390a73a6ae810cef /lib | |
| parent | 5ebc4d92cd5fbb46c627eb04d500384893dbe2b4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities/project_import_status.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/entities/project_import_status.rb b/lib/api/entities/project_import_status.rb index 9b7a2bd1f3e..de7b4b998be 100644 --- a/lib/api/entities/project_import_status.rb +++ b/lib/api/entities/project_import_status.rb @@ -5,7 +5,7 @@ module API class ProjectImportStatus < ProjectIdentity expose :import_status expose :correlation_id do |project, _options| - project.import_state.correlation_id + project.import_state&.correlation_id end # TODO: Use `expose_nil` once we upgrade the grape-entity gem diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index df48e347511..d95da262eea 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -98,7 +98,6 @@ module Gitlab preview raw refs - sse tree update wikis |