diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/fixtures/lib | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/fixtures/lib')
| -rw-r--r-- | spec/fixtures/lib/gitlab/import_export/complex/project.json | 20 | ||||
| -rw-r--r-- | spec/fixtures/lib/gitlab/import_export/designs/project.json | 9 |
2 files changed, 28 insertions, 1 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json index d88b2ebc83a..637e01bf123 100644 --- a/spec/fixtures/lib/gitlab/import_export/complex/project.json +++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json @@ -7211,5 +7211,23 @@ } ] } - ] + ], + "push_rule": { + "force_push_regex": "MustContain", + "delete_branch_regex": "MustContain", + "commit_message_regex": "MustContain", + "author_email_regex": "MustContain", + "file_name_regex": "MustContain", + "branch_name_regex": "MustContain", + "commit_message_negative_regex": "MustNotContain", + "max_file_size": 1, + "deny_delete_tag": true, + "member_check": true, + "is_sample": true, + "prevent_secrets": true, + "reject_unsigned_commits": true, + "commit_committer_check": true, + "regexp_uses_re2": true + } + } diff --git a/spec/fixtures/lib/gitlab/import_export/designs/project.json b/spec/fixtures/lib/gitlab/import_export/designs/project.json index ebc08868d9e..e11b10a1d4c 100644 --- a/spec/fixtures/lib/gitlab/import_export/designs/project.json +++ b/spec/fixtures/lib/gitlab/import_export/designs/project.json @@ -98,6 +98,7 @@ "designs":[ { "id":38, + "iid": 1, "project_id":30, "issue_id":469, "filename":"chirrido3.jpg", @@ -107,6 +108,7 @@ }, { "id":39, + "iid": 2, "project_id":30, "issue_id":469, "filename":"jonathan_richman.jpg", @@ -116,6 +118,7 @@ }, { "id":40, + "iid": 3, "project_id":30, "issue_id":469, "filename":"mariavontrap.jpeg", @@ -137,6 +140,7 @@ "event":0, "design":{ "id":38, + "iid": 1, "project_id":30, "issue_id":469, "filename":"chirrido3.jpg" @@ -156,6 +160,7 @@ "event":1, "design":{ "id":38, + "iid": 1, "project_id":30, "issue_id":469, "filename":"chirrido3.jpg" @@ -167,6 +172,7 @@ "event":0, "design":{ "id":39, + "iid": 2, "project_id":30, "issue_id":469, "filename":"jonathan_richman.jpg" @@ -186,6 +192,7 @@ "event":1, "design":{ "id":38, + "iid": 1, "project_id":30, "issue_id":469, "filename":"chirrido3.jpg" @@ -197,6 +204,7 @@ "event":2, "design":{ "id":39, + "iid": 2, "project_id":30, "issue_id":469, "filename":"jonathan_richman.jpg" @@ -208,6 +216,7 @@ "event":0, "design":{ "id":40, + "iid": 3, "project_id":30, "issue_id":469, "filename":"mariavontrap.jpeg" |