diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-05 22:00:36 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-05-05 22:00:36 +0100 |
| commit | 86e75ae09238c7f73347c0e310c47f6070c005b9 (patch) | |
| tree | e2ce5edb596eb8b35cf530669f34bf1cb034b05a /spec/lib | |
| parent | c1d5af67d3743b12718939c9d60c38035d388176 (diff) | |
| parent | 8c4c40d09b6947f4ac652dd76cc422fea2a6443d (diff) | |
| download | gitlab-ce-86e75ae09238c7f73347c0e310c47f6070c005b9.tar.gz | |
Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index cd2fa27bb9f..f7654f1aade 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -9,6 +9,7 @@ issues: - notes - label_links - labels +- last_edited_by - todos - user_agent_detail - moved_to @@ -27,6 +28,7 @@ notes: - noteable - author - updated_by +- last_edited_by - resolved_by - todos - events @@ -72,6 +74,7 @@ merge_requests: - notes - label_links - labels +- last_edited_by - todos - target_project - source_project diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 59c8b48a2be..a66086f8b47 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -23,6 +23,8 @@ Issue: - weight - time_estimate - relative_position +- last_edited_at +- last_edited_by_id Event: - id - target_type @@ -154,6 +156,8 @@ MergeRequest: - approvals_before_merge - rebase_commit_sha - time_estimate +- last_edited_at +- last_edited_by_id MergeRequestDiff: - id - state |