diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 09:10:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 09:10:53 +0000 |
| commit | 04251829ba135a8bab845e9e49d8475eb0211e86 (patch) | |
| tree | cc39e928a905204eaa4032299a51009f94a000b5 /spec/views | |
| parent | dd7449b92454dd614b5a60efd5fe44561174d2fa (diff) | |
| parent | 04cf618b6ff943527938f64a451a420b494b5a76 (diff) | |
| download | gitlab-ce-04251829ba135a8bab845e9e49d8475eb0211e86.tar.gz | |
Merge branch 'dm-collapsed-blob' into 'master'
Consistent diff and blob size limit names
See merge request !11776
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/blob/_viewer.html.haml_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/views/projects/blob/_viewer.html.haml_spec.rb b/spec/views/projects/blob/_viewer.html.haml_spec.rb index c6b0ed8da3c..bbd7f98fa8d 100644 --- a/spec/views/projects/blob/_viewer.html.haml_spec.rb +++ b/spec/views/projects/blob/_viewer.html.haml_spec.rb @@ -10,8 +10,8 @@ describe 'projects/blob/_viewer.html.haml', :view do include BlobViewer::Rich self.partial_name = 'text' - self.overridable_max_size = 1.megabyte - self.max_size = 5.megabytes + self.collapse_limit = 1.megabyte + self.size_limit = 5.megabytes self.load_async = true end end |