diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 11:17:02 +0300 |
commit | b39512ed755239198a9c294b6a45e65c05900235 (patch) | |
tree | d234a3efade1de67c46b9e5a38ce813627726aa7 /app/helpers/blob_helper.rb | |
parent | d31474cf3b17ece37939d20082b07f6657cc79a9 (diff) |
Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42
Diffstat (limited to 'app/helpers/blob_helper.rb')
-rw-r--r-- | app/helpers/blob_helper.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index fcf6a177984..2c84da4862a 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -98,9 +98,9 @@ module BlobHelper ref, path, blob: blob, - label: _("Replace"), - action: "replace", - btn_class: "default", + label: _("Replace"), + action: "replace", + btn_class: "default", modal_type: "upload" ) end @@ -111,9 +111,9 @@ module BlobHelper ref, path, blob: blob, - label: _("Delete"), - action: "delete", - btn_class: "default", + label: _("Delete"), + action: "delete", + btn_class: "default", modal_type: "remove" ) end @@ -298,7 +298,9 @@ module BlobHelper def readable_blob(options, path, project, ref) blob = options.fetch(:blob) do - project.repository.blob_at(ref, path) rescue nil + project.repository.blob_at(ref, path) + rescue StandardError + nil end blob if blob&.readable_text? |