diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 13:36:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 13:36:03 +0000 |
commit | 39b0e286bcf1239424eed8e0dac118a9f4f4b6ac (patch) | |
tree | 3cee07417e86b487913af6dd0d2084da31fa3f1c /app/views | |
parent | 9fc4650da6efa808960b28f9e77fede55424d77e (diff) | |
download | gitlab-ce-39b0e286bcf1239424eed8e0dac118a9f4f4b6ac.tar.gz |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'app/views')
3 files changed, 13 insertions, 9 deletions
diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml index 6e7ec1264ea..20bf7d232ce 100644 --- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -4,7 +4,7 @@ = link_to new_project_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -14,7 +14,7 @@ - if current_user.can_create_group? = link_to new_group_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_group") + = custom_icon("add_new_group", size: 50) .blank-state-body %h3.blank-state-title Create a group @@ -23,7 +23,7 @@ = link_to new_admin_user_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_user") + = custom_icon("add_new_user", size: 50) .blank-state-body %h3.blank-state-title Add people @@ -32,7 +32,7 @@ = link_to admin_root_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/configure_server") + = custom_icon("configure_server", size: 50) .blank-state-body %h3.blank-state-title Configure GitLab diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index e3af3405b76..913f0e8cfae 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -4,7 +4,7 @@ - if current_user.can_create_project? = link_to new_project_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -13,7 +13,7 @@ - else .blank-state .blank-state-icon - = image_tag("illustrations/welcome/add_new_project") + = custom_icon("add_new_project", size: 50) .blank-state-body %h3.blank-state-title Create a project @@ -23,7 +23,7 @@ - if current_user.can_create_group? = link_to new_group_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/add_new_group") + = custom_icon("add_new_group", size: 50) .blank-state-body %h3.blank-state-title Create a group @@ -33,7 +33,7 @@ - if public_project_count > 0 = link_to trending_explore_projects_path, class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/globe") + = custom_icon("globe", size: 50) .blank-state-body %h3.blank-state-title Explore public projects @@ -46,7 +46,7 @@ = link_to "https://docs.gitlab.com/", class: "blank-state blank-state-link" do .blank-state-icon - = image_tag("illustrations/welcome/lightbulb") + = custom_icon("lightbulb", size: 50) .blank-state-body %h3.blank-state-title Learn more about GitLab diff --git a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml index fb03e6e12e3..3670e19c240 100644 --- a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml +++ b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml @@ -7,3 +7,7 @@ = link_to _('Settings'), project_settings_ci_cd_path(project), class: 'alert-link' | = link_to _('Dismiss'), '#', class: 'hide-auto-devops-implicitly-enabled-banner alert-link', data: { project_id: project.id } + - unless Gitlab.config.registry.enabled + %div + = icon('exclamation-triangle') + = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work.') |