diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 16:47:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 16:47:27 +0000 |
| commit | a68a39e34120e0cf67d95e143326d03f61288cdf (patch) | |
| tree | d979ff0c94c6b78a4c19e55fda18b1f2c88ba852 /spec/lib | |
| parent | 8c4dea25d4b76d75d83d22b9925d784ec09b46f9 (diff) | |
| parent | 26f6065ec686d16a053e33f031779a8e75f0c5c9 (diff) | |
| download | gitlab-ce-a68a39e34120e0cf67d95e143326d03f61288cdf.tar.gz | |
Merge branch '18608-lock-issues-v2' into 'master'
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 48938346577..0ab493a4246 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -25,6 +25,7 @@ Issue: - relative_position - last_edited_at - last_edited_by_id +- discussion_locked Event: - id - target_type @@ -168,6 +169,7 @@ MergeRequest: - last_edited_at - last_edited_by_id - head_pipeline_id +- discussion_locked MergeRequestDiff: - id - state |