diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 12:06:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 12:06:56 +0000 |
| commit | 6cdc0f32fabea92606c8cda040a3d0875914b906 (patch) | |
| tree | 8ce718efe3ac030c555d0294157107187c88ee75 | |
| parent | 25989ab7ef1a444ed2abd5479f176d58e1d9462a (diff) | |
| download | gitlab-ce-6cdc0f32fabea92606c8cda040a3d0875914b906.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | spec/serializers/build_details_entity_spec.rb | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/spec/serializers/build_details_entity_spec.rb b/spec/serializers/build_details_entity_spec.rb index 6a84694cee9..91c5fd6bf2c 100644 --- a/spec/serializers/build_details_entity_spec.rb +++ b/spec/serializers/build_details_entity_spec.rb @@ -139,7 +139,8 @@ describe BuildDetailsEntity do it { is_expected.to include(failure_reason: 'missing_dependency_failure') } it 'includes the failing dependencies in the callout message' do - expect(message).to include('test2, test1') + expect(message).to include('test1') + expect(message).to include('test2') end end diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100644..100755 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |