Add latest changes from gitlab-org/gitlab@master

1 files changed, 35 insertions, 2 deletions

diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index f57f0f3c08c..cdf9395fbe6 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -8039,7 +8039,7 @@
           "protected_environment_id": 1,
           "created_at": "2017-10-19T15:36:23.466Z",
           "updated_at": "2017-10-19T15:36:23.466Z",
-          "access_level": null,
+          "access_level": 40,
           "user_id": 1,
           "group_id": null
         }
@@ -8309,5 +8309,38 @@
     "reject_unsigned_commits": true,
     "commit_committer_check": true,
     "regexp_uses_re2": true
-  }
+  },
+  "approval_rules": [
+    {
+      "approvals_required": 1,
+      "name": "MustContain",
+      "rule_type": "regular",
+      "scanners": [
+
+      ],
+      "vulnerabilities_allowed": 0,
+      "severity_levels": [
+        "unknown",
+        "high",
+        "critical"
+      ],
+      "report_type": null,
+      "vulnerability_states": [
+        "newly_detected"
+      ],
+      "orchestration_policy_idx": null,
+      "applies_to_all_protected_branches": false,
+      "approval_project_rules_protected_branches": [
+        {
+          "protected_branch_id": 1,
+          "branch_name": "master"
+        }
+      ],
+      "approval_project_rules_users": [
+        {
+          "user_id": 35
+        }
+      ]
+    }
+  ]
 }