diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-10-15 21:23:45 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-10-15 21:23:45 +0000 |
| commit | bfbbc52faaae2a1a06e065511a1a8661203e868a (patch) | |
| tree | 58436fd55ef0624090befc0499a31908e280cf69 | |
| parent | e7d9e8b4224ce4b22bfd14321d5315ef7680662d (diff) | |
| parent | bf8ebe4df3b0e37337aba15dcfc7588236e503b8 (diff) | |
| download | gitlab-ce-bfbbc52faaae2a1a06e065511a1a8661203e868a.tar.gz | |
Merge remote-tracking branch 'dev/13-4-stable' into 13-4-stable
| -rw-r--r-- | changelogs/unreleased/revert-42465-and-42343.yml | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
3 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/revert-42465-and-42343.yml b/changelogs/unreleased/revert-42465-and-42343.yml new file mode 100644 index 00000000000..4c7342c9d0d --- /dev/null +++ b/changelogs/unreleased/revert-42465-and-42343.yml @@ -0,0 +1,5 @@ +--- +title: 'Revert 42465 and 42343: Expanded collapsed diff files' +merge_request: 43361 +author: +type: other diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- 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 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |