summaryrefslogtreecommitdiff
path: root/app/views/admin/application_settings/general.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 12:08:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 12:08:54 +0000
commit50ae4065530c4eafbeb7c5ff2c462c48c02947ca (patch)
treea88b718bd281c58fcd9e60fd49585e5ca1dca26c /app/views/admin/application_settings/general.html.haml
parentbe37a0ee5e3e3dbb967266248f0f46f14a9931e2 (diff)
downloadgitlab-ce-50ae4065530c4eafbeb7c5ff2c462c48c02947ca.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/application_settings/general.html.haml')
-rw-r--r--app/views/admin/application_settings/general.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml
index b9f49fdc9de..94048060767 100644
--- a/app/views/admin/application_settings/general.html.haml
+++ b/app/views/admin/application_settings/general.html.haml
@@ -20,7 +20,7 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded_by_default? ? _('Collapse') : _('Expand')
%p
- = _('Session expiration, projects limit and attachment size.')
+ = _('Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.')
.settings-content
= render 'account_and_limit'