Skip to content

G
gitlab-ce
Commit f8dcbdd1 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Merge branch 'jv-fix-workhorse-attributes' into 'master' 

Fix workhorse testdata PDF LFS issue

See merge request gitlab-org/gitlab!49021
parents aed3fb12 5c4b50ff
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
.gitattributes
View file @ f8dcbdd1
...@@ -2,3 +2,4 @@ VERSION merge=ours ...@@ -2,3 +2,4 @@ VERSION merge=ours
Dangerfile gitlab-language=ruby Dangerfile gitlab-language=ruby
*.pdf filter=lfs diff=lfs merge=lfs -text *.pdf filter=lfs diff=lfs merge=lfs -text
*.rb diff=ruby *.rb diff=ruby
workhorse/testdata/*.pdf -filter -diff -merge
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7