diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-28 13:28:38 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-28 13:28:38 +0300 |
| commit | 11f8a97f4a53b0f9bd2271d8dee02e7b5cfe252b (patch) | |
| tree | c19e0872572308da980cfa8c50cb292b2ce61f94 /spec/support | |
| parent | 4d6fe39a69373b199ed0897fcd7e10296d8d1121 (diff) | |
| parent | 5a3e6fdff96f50cb293a8c9fe64ccbf59619936f (diff) | |
Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'
Fix bug commenting LFS images and displaying LFS files
Closes #43783
See merge request gitlab-org/gitlab-ce!23812
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/fake_blob_helpers.rb | 2 | ||||
| -rw-r--r-- | spec/support/helpers/test_env.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/support/helpers/fake_blob_helpers.rb b/spec/support/helpers/fake_blob_helpers.rb index bc9686ed9cf..801ca8b7412 100644 --- a/spec/support/helpers/fake_blob_helpers.rb +++ b/spec/support/helpers/fake_blob_helpers.rb @@ -23,7 +23,7 @@ module FakeBlobHelpers 0 end - def binary? + def binary_in_repo? @binary end diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index d52c40ff4f1..d352a7cdf1a 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -62,7 +62,8 @@ module TestEnv 'between-create-delete-modify-move' => '3f5f443', 'after-create-delete-modify-move' => 'ba3faa7', 'with-codeowners' => '219560e', - 'submodule_inside_folder' => 'b491b92' + 'submodule_inside_folder' => 'b491b92', + 'png-lfs' => 'fe42f41' }.freeze # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |