diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-16 07:14:59 +0000 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-20 10:17:30 -0500 |
| commit | e13427d150d182814bb93d2e305aaf18f7d984ff (patch) | |
| tree | d531675f86f4be5cd2b0253c9c98c8afe3ba7f37 /app | |
| parent | 12d5ebd7e6ef1b7d6709bce18be265dfa1cbf91b (diff) | |
| download | gitlab-ce-e13427d150d182814bb93d2e305aaf18f7d984ff.tar.gz | |
Merge branch 'master' into 'master'
Added missing html_safe on text messages.
See merge request gitlab-org/gitlab-ce!21232
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/settings/ci_cd/_form.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 434aed2f603..9134257b631 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -17,7 +17,7 @@ %h5.prepend-top-0 = _("Git strategy for pipelines") %p - = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code") + = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code").html_safe = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank' .form-check = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' } @@ -47,7 +47,7 @@ = f.label :ci_config_path, _('Custom CI config path'), class: 'label-bold' = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted - = _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>") + = _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>").html_safe = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank' %hr |