diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-16 20:26:04 +0000 |
| commit | 67312fceaa69abb2bc88aa62601625e9f6a62270 (patch) | |
| tree | f67e39bab7386f870e4908dba0746914a4db7d29 /spec/helpers | |
| parent | e66b811d81d399fdfeed13563db108242f9021e6 (diff) | |
| parent | b0a163208c1b428fc9f5adad6489f8a3ab884a2b (diff) | |
| download | gitlab-ce-67312fceaa69abb2bc88aa62601625e9f6a62270.tar.gz | |
Merge branch 'dm-blob-viewer-concerns' into 'master'
Move some blob viewer stuff around without changing behavior
See merge request !11358
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/blob_helper_spec.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/helpers/blob_helper_spec.rb b/spec/helpers/blob_helper_spec.rb index 1b4393e6167..41b5df12522 100644 --- a/spec/helpers/blob_helper_spec.rb +++ b/spec/helpers/blob_helper_spec.rb @@ -116,10 +116,11 @@ describe BlobHelper do let(:viewer_class) do Class.new(BlobViewer::Base) do - self.max_size = 1.megabyte - self.absolute_max_size = 5.megabytes + include BlobViewer::ServerSide + + self.overridable_max_size = 1.megabyte + self.max_size = 5.megabytes self.type = :rich - self.client_side = false end end |