mirror of
https://github.com/gitlabhq/gitlabhq.git
synced 2025-08-15 23:30:46 +00:00
Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
@ -10,6 +10,10 @@ module Diffs
|
||||
@merge_request = merge_request
|
||||
end
|
||||
|
||||
def before_render
|
||||
@can_download_files = commit? || merge_request?
|
||||
end
|
||||
|
||||
def message
|
||||
html_escape(message_text) % {
|
||||
display_size: @diff_files.size,
|
||||
@ -39,6 +43,20 @@ module Diffs
|
||||
end
|
||||
end
|
||||
|
||||
def message_text
|
||||
base_message = _(
|
||||
"For a faster browsing experience, only %{strong_open}%{display_size} of %{real_size}%{strong_close} " \
|
||||
"files are shown."
|
||||
)
|
||||
download_message = _("Download one of the files below to see all changes.")
|
||||
|
||||
if @can_download_files
|
||||
"#{base_message} #{download_message}"
|
||||
else
|
||||
base_message
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def commit?
|
||||
@ -51,12 +69,5 @@ module Diffs
|
||||
@merge_request.present? &&
|
||||
@merge_request.persisted?
|
||||
end
|
||||
|
||||
def message_text
|
||||
_(
|
||||
"For a faster browsing experience, only %{strong_open}%{display_size} of %{real_size}%{strong_close} " \
|
||||
"files are shown. Download one of the files below to see all changes."
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user