From 580622bdb3c762a8e89facd8a3946881ee480442 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 31 Mar 2020 18:07:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../projects/blob/_pipeline_tour_success.html.haml | 4 ++- .../projects/registry/repositories/index.html.haml | 39 ++++++++-------------- 2 files changed, 17 insertions(+), 26 deletions(-) (limited to 'app/views/projects') diff --git a/app/views/projects/blob/_pipeline_tour_success.html.haml b/app/views/projects/blob/_pipeline_tour_success.html.haml index 7ecbc1974ec..cf1427df044 100644 --- a/app/views/projects/blob/_pipeline_tour_success.html.haml +++ b/app/views/projects/blob/_pipeline_tour_success.html.haml @@ -1 +1,3 @@ -.js-success-pipeline-modal{ 'data-commit-cookie': suggest_pipeline_commit_cookie_name, 'data-pipelines-path': project_pipelines_path(@project) } +.js-success-pipeline-modal{ data: { 'commit-cookie': suggest_pipeline_commit_cookie_name, + 'go-to-pipelines-path': project_pipelines_path(@project), + 'human-access': @project.team.human_max_access(current_user&.id) } } diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml index 80dd5eaecb2..650e63eb406 100644 --- a/app/views/projects/registry/repositories/index.html.haml +++ b/app/views/projects/registry/repositories/index.html.haml @@ -4,28 +4,17 @@ %section .row.registry-placeholder.prepend-bottom-10 .col-12 - - if Feature.enabled?(:vue_container_registry_explorer, @project.group) - #js-container-registry{ data: { endpoint: project_container_registry_index_path(@project), - settings_path: project_settings_ci_cd_path(@project), - expiration_policy: @project.container_expiration_policy.to_json, - "help_page_path" => help_page_path('user/packages/container_registry/index'), - "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'), - "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'), - "no_containers_image" => image_path('illustrations/docker-empty-state.svg'), - "containers_error_image" => image_path('illustrations/docker-error-state.svg'), - "repository_url" => escape_once(@project.container_registry_url), - "registry_host_url_with_port" => escape_once(registry_config.host_port), - "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'), - "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'), - "is_admin": current_user&.admin, - character_error: @character_error.to_s } } - - else - #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json), - "help_page_path" => help_page_path('user/packages/container_registry/index'), - "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'), - "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'), - "no_containers_image" => image_path('illustrations/docker-empty-state.svg'), - "containers_error_image" => image_path('illustrations/docker-error-state.svg'), - "repository_url" => escape_once(@project.container_registry_url), - "registry_host_url_with_port" => escape_once(registry_config.host_port), - character_error: @character_error.to_s } } + #js-container-registry{ data: { endpoint: project_container_registry_index_path(@project), + settings_path: project_settings_ci_cd_path(@project), + expiration_policy: @project.container_expiration_policy.to_json, + "help_page_path" => help_page_path('user/packages/container_registry/index'), + "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'), + "personal_access_tokens_help_link" => help_page_path('user/profile/personal_access_tokens'), + "no_containers_image" => image_path('illustrations/docker-empty-state.svg'), + "containers_error_image" => image_path('illustrations/docker-error-state.svg'), + "repository_url" => escape_once(@project.container_registry_url), + "registry_host_url_with_port" => escape_once(registry_config.host_port), + "expiration_policy_help_page_path" => help_page_path('user/packages/container_registry/index', anchor: 'expiration-policy'), + "garbage_collection_help_page_path" => help_page_path('administration/packages/container_registry', anchor: 'container-registry-garbage-collection'), + "is_admin": current_user&.admin, + character_error: @character_error.to_s } } -- cgit v1.2.3