diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 15:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 15:10:03 +0300 |
| commit | 43b4b3e2d2ddebc0a89b94a8251c162ec5719780 (patch) | |
| tree | 8a21146370cfd1b24b25cfcacef53e889746f5aa /spec/lib/gitlab | |
| parent | 196ada0844fff7642463fbd08a44609a1e1fa713 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/danger/helper_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb index dd183281977..1c9df641655 100644 --- a/spec/lib/gitlab/danger/helper_spec.rb +++ b/spec/lib/gitlab/danger/helper_spec.rb @@ -206,7 +206,6 @@ describe Gitlab::Danger::Helper do 'Gemfile' | :backend 'Gemfile.lock' | :backend - 'Procfile' | :backend 'Rakefile' | :backend 'FOO_VERSION' | :backend diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 4c9caaa181a..5b0444c394e 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -31,6 +31,7 @@ Issue: - last_edited_by_id - discussion_locked - health_status +- external_key Event: - id - target_type @@ -843,6 +844,7 @@ Epic: - start_date_sourcing_epic_id - due_date_sourcing_epic_id - health_status + - external_key EpicIssue: - id - relative_position |