diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 18:40:28 +0300 |
commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /spec/fixtures/gitlab | |
parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'spec/fixtures/gitlab')
-rw-r--r-- | spec/fixtures/gitlab/git/gitattributes | 16 | ||||
-rw-r--r-- | spec/fixtures/gitlab/git/gitattributes_invalid | bin | 0 -> 16 bytes | |||
-rw-r--r-- | spec/fixtures/gitlab/import_export/labels.tar.gz | bin | 0 -> 768 bytes |
3 files changed, 16 insertions, 0 deletions
diff --git a/spec/fixtures/gitlab/git/gitattributes b/spec/fixtures/gitlab/git/gitattributes new file mode 100644 index 00000000000..bfe9c8e4ed2 --- /dev/null +++ b/spec/fixtures/gitlab/git/gitattributes @@ -0,0 +1,16 @@ +# This is a comment, it should be ignored. + +*.txt text +*.jpg -text +*.sh eol=lf gitlab-language=shell +*.haml.* gitlab-language=haml +foo/bar.* foo +*.cgi key=value?p1=v1&p2=v2 +/*.png gitlab-language=png +*.binary binary +/custom-highlighting/*.gitlab-custom gitlab-language=ruby +/custom-highlighting/*.gitlab-cgi gitlab-language=erb?parent=json + +# This uses a tab instead of spaces to ensure the parser also supports this. +*.md gitlab-language=markdown +bla/bla.txt diff --git a/spec/fixtures/gitlab/git/gitattributes_invalid b/spec/fixtures/gitlab/git/gitattributes_invalid Binary files differnew file mode 100644 index 00000000000..57e0e8e0d3b --- /dev/null +++ b/spec/fixtures/gitlab/git/gitattributes_invalid diff --git a/spec/fixtures/gitlab/import_export/labels.tar.gz b/spec/fixtures/gitlab/import_export/labels.tar.gz Binary files differnew file mode 100644 index 00000000000..8329dcf3b4a --- /dev/null +++ b/spec/fixtures/gitlab/import_export/labels.tar.gz |