diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-09-05 16:01:37 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-09-05 16:01:37 +0300 |
| commit | 4aeb9f8754cd0a4fb37d9d0d22ac9c2f1f73ba77 (patch) | |
| tree | 3bf58eb8e415771f28270910a66672b4d9db87b9 /spec | |
| parent | 95ef27253909ba7ff30667af14f7ea2256c1ae8d (diff) | |
| parent | 0e40b41e224f18076426578da08548ae22afdcd1 (diff) | |
Merge branch '10395-require-code-owner-approval-on-pushes' into 'master'
EE->CE: Structure for "Require code owner approval on pushes"
See merge request gitlab-org/gitlab-ce!32607
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/checks/diff_check_spec.rb | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/checks/diff_check_spec.rb b/spec/lib/gitlab/checks/diff_check_spec.rb index a341dfa5636..b9134b8d6ab 100644 --- a/spec/lib/gitlab/checks/diff_check_spec.rb +++ b/spec/lib/gitlab/checks/diff_check_spec.rb @@ -20,9 +20,8 @@ describe Gitlab::Checks::DiffCheck do allow(project).to receive(:lfs_enabled?).and_return(false) end - it 'skips the validation' do - expect(subject).not_to receive(:validate_diff) - expect(subject).not_to receive(:validate_file_paths) + it 'does not invoke :lfs_file_locks_validation' do + expect(subject).not_to receive(:lfs_file_locks_validation) subject.validate! end diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 516e62c4728..1386f8822ce 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -467,6 +467,7 @@ ProtectedBranch: - name - created_at - updated_at +- code_owner_approval_required ProtectedTag: - id - project_id |