diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-01-31 08:58:58 -0600 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-02-04 12:08:09 -0600 |
| commit | 087af654bbae1e4a843029b33e1aab546f4d7d61 (patch) | |
| tree | 9230a20b2eb5deecd93d431bf30489d714887c20 /app/views/projects/settings/ci_cd | |
| parent | 8b5553daa43d48fdef42f0f2a3f700580dea770b (diff) | |
| download | gitlab-ce-087af654bbae1e4a843029b33e1aab546f4d7d61.tar.gz | |
Addresses backend/db review comments
- Fixes multiple typos on AutoDevops script
- Add an alias to Clusters::Cluster#domain as base_domain, so it's more
descriptive
- Removes unnecessary memoization on qa specs
- Changes migration to a post migration to deal better with traffic on
big instances (like gitlab.com)
Diffstat (limited to 'app/views/projects/settings/ci_cd')
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index c2bbcf8fcaf..d905d015c22 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -22,7 +22,7 @@ = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' .card-footer.js-extra-settings{ class: @project.auto_devops_enabled? || 'hidden' } %p.settings-message.text-center - - kubernetes_cluster_link = 'https://docs.gitlab.com/ee/user/project/clusters/' + - kubernetes_cluster_link = help_page_path('user/project/clusters/') - kubernetes_cluster_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: kubernetes_cluster_link } = s_('CICD|You must add a %{kubernetes_cluster_start}Kubernetes cluster integration%{kubernetes_cluster_end} to this project with a domain in order for your deployment strategy to work correctly.').html_safe % { kubernetes_cluster_start: kubernetes_cluster_start, kubernetes_cluster_end: '</a>'.html_safe } %label.prepend-top-10 |