Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-28 15:10:10 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-28 15:10:10 +0300
commit22fd199237e247c36de5b982d444cedc194126e6 (patch)
tree1a5ad68a1dffdf37dfae0d1267bf3bcc04c292cb /app/views/ci
parent97b93f6d05b26e57a4d6a6d33a46aacb5f3235a6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/ci')
-rw-r--r--app/views/ci/variables/_content.html.haml2
-rw-r--r--app/views/ci/variables/_header.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/ci/variables/_content.html.haml b/app/views/ci/variables/_content.html.haml
index b597c2d442a..97d96a50860 100644
--- a/app/views/ci/variables/_content.html.haml
+++ b/app/views/ci/variables/_content.html.haml
@@ -1,4 +1,4 @@
-= _('Variables store information, like passwords and secret keys, that you can use in job scripts.')
+= format(_('CiVariables|Variables store information, like passwords and secret keys, that you can use in job scripts. Each %{entity} can define a maximum of %{limit} variables.'), entity: entity, limit: variable_limit).html_safe
= link_to s_('Learn more.'), help_page_path('ci/variables/index'), target: '_blank', rel: 'noopener noreferrer'
%p
= _('Variables can be:')
diff --git a/app/views/ci/variables/_header.html.haml b/app/views/ci/variables/_header.html.haml
index d6a9ce72d03..dfcf8f39533 100644
--- a/app/views/ci/variables/_header.html.haml
+++ b/app/views/ci/variables/_header.html.haml
@@ -7,4 +7,4 @@
= expanded ? _('Collapse') : _('Expand')
%p
- = render "ci/variables/content"
+ = render "ci/variables/content", entity: @entity, variable_limit: @variable_limit