diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-17 12:22:52 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-17 12:25:43 +0200 |
commit | 2a87a55f8739ede196d856851217fd8686eb7634 (patch) | |
tree | 2bc350e207d3e4680a7023e4e67a32ae1ec3bb30 /app/models/blob.rb | |
parent | d9ca84015c04d8836c09c3ebb70a8240262b60e8 (diff) | |
parent | faee4763f7a166772bb40945f82da4b25a95e7d5 (diff) | |
download | gitlab-ce-2a87a55f8739ede196d856851217fd8686eb7634.tar.gz |
Merge branch 'master' into refactor/ci-config-add-entry-error
* master: (189 commits)
Update CHANGELOG for !4659
Center the header logo for all Devise emails
Add previews for all customized Devise emails
Customize the Devise `unlock_instructions` email
Customize the Devise `reset_password_instructions` email
Customize the Devise `password_change` emails
Use gitlab-git 10.2.0
Use Git cached counters on project show page
Fix indentation scss-lint errors
Added title attribute to enties in tree view Closes #18353
Banzai::Filter::ExternalLinkFilter use XPath
Reduce queries in IssueReferenceFilter
Use gitlab_git 10.1.4
Fixed ordering in Project.find_with_namespace
Fix images in emails
Banzai::Filter::UploadLinkFilter use XPath
Turn Group#owners into a has_many association
Make project_id nullable
...
Diffstat (limited to 'app/models/blob.rb')
-rw-r--r-- | app/models/blob.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index 0fea6b7f576..4279ea2ce57 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -24,7 +24,7 @@ class Blob < SimpleDelegator end def only_display_raw? - size && size > 5.megabytes + size && truncated? end def svg? |