Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
299a3a9a
Commit
299a3a9a
authored
Jun 08, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dm-empty-blob-viewer-binary' into 'master'
Empty blob viewer isn’t binary-only See merge request !11979
parents
e9002222
eee712c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
app/models/blob.rb
app/models/blob.rb
+1
-1
app/models/blob_viewer/empty.rb
app/models/blob_viewer/empty.rb
+0
-1
No files found.
app/models/blob.rb
View file @
299a3a9a
...
@@ -180,7 +180,7 @@ class Blob < SimpleDelegator
...
@@ -180,7 +180,7 @@ class Blob < SimpleDelegator
end
end
def
rendered_as_text?
(
ignore_errors:
true
)
def
rendered_as_text?
(
ignore_errors:
true
)
simple_viewer
.
text?
&&
(
ignore_errors
||
simple_viewer
.
render_error
.
nil?
)
simple_viewer
.
is_a?
(
BlobViewer
::
Text
)
&&
(
ignore_errors
||
simple_viewer
.
render_error
.
nil?
)
end
end
def
show_viewer_switcher?
def
show_viewer_switcher?
...
...
app/models/blob_viewer/empty.rb
View file @
299a3a9a
...
@@ -4,6 +4,5 @@ module BlobViewer
...
@@ -4,6 +4,5 @@ module BlobViewer
include
ServerSide
include
ServerSide
self
.
partial_name
=
'empty'
self
.
partial_name
=
'empty'
self
.
binary
=
true
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment