Commit 1dfddd9e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '208471-actionview-template-error-undefined-method-concat-for-nil-nilclass' into 'master'

Resolve "ActionView::Template::Error: undefined method `concat' for nil:NilClass"

Closes #208471

See merge request gitlab-org/gitlab!26395
parents 12917a6f 5da3f94a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= runner_status_icon(runner) = runner_status_icon(runner)
- if @project_runners.include?(runner) - if @project_runners.include?(runner)
= link_to runner.short_sha.concat("..."), project_runner_path(@project, runner), class: 'commit-sha has-tooltip', title: _("Partial token for reference only") = link_to _("%{token}...") % { token: runner.short_sha }, project_runner_path(@project, runner), class: 'commit-sha has-tooltip', title: _("Partial token for reference only")
- if runner.locked? - if runner.locked?
= icon('lock', class: 'has-tooltip', title: _('Locked to current projects')) = icon('lock', class: 'has-tooltip', title: _('Locked to current projects'))
......
---
title: Fix an error with concat method
merge_request:
author:
type: fixed
...@@ -484,6 +484,9 @@ msgstr "" ...@@ -484,6 +484,9 @@ msgstr ""
msgid "%{title} changes" msgid "%{title} changes"
msgstr "" msgstr ""
msgid "%{token}..."
msgstr ""
msgid "%{totalWeight} total weight" msgid "%{totalWeight} total weight"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment