diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 16:32:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 16:32:54 +0000 |
commit | e2aba30891c3deff4174df08b92817095eec38d5 (patch) | |
tree | 637ec611fec19a45fb65fb0390c3f7787f1411bd | |
parent | 01196ac93318e5803575258710a02dc85b7d4b71 (diff) | |
download | gitlab-ce-e2aba30891c3deff4174df08b92817095eec38d5.tar.gz |
Add latest changes from gitlab-org/gitlab@12-8-stable-ee
-rw-r--r-- | changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml | 5 | ||||
-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, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml new file mode 100644 index 00000000000..6b6d479e815 --- /dev/null +++ b/changelogs/unreleased/208548-better-spec-test-for-error-tracking-web-ui.yml @@ -0,0 +1,5 @@ +--- +title: Fix fixtures for Error Tracking Web UI +merge_request: 26233 +author: Takuya Noguchi +type: other 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 |