From 95eba3aa8a035049a97ec059d3fe83c679641257 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 19 Sep 2017 19:43:23 +0200 Subject: Improve after code-review --- app/helpers/auto_devops_helper.rb | 4 ++-- app/views/projects/settings/ci_cd/show.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb index 5da68a2d03d..483b957decb 100644 --- a/app/helpers/auto_devops_helper.rb +++ b/app/helpers/auto_devops_helper.rb @@ -18,9 +18,9 @@ module AutoDevopsHelper } if missing_domain - _('Auto Review Apps and Auto Deploy need a domain name and the %s to work correctly.') % params + _('Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly.') % params else - _('Auto Review Apps and Auto Deploy need the %s to work correctly.') % params + _('Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly.') % params end elsif missing_domain _('Auto Review Apps and Auto Deploy need a domain name to work correctly.') diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 4e682d196c4..47c056d097a 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -13,7 +13,7 @@ %button.btn.js-settings-toggle = expanded ? 'Collapse' : 'Expand' %p - Update your CI/CD configuration. You need a CI/CD configuration file or Auto DevOps enabled in order to use pipelines. + Update your CI/CD configuration, like job timeout or Auto DevOps. .settings-content.no-animate{ class: ('expanded' if expanded) } = render 'projects/pipelines_settings/show' -- cgit v1.2.1