diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_gitlab_version.html.haml | 10 | ||||
| -rw-r--r-- | app/views/profiles/notifications/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/deployments/_rollback.haml | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index ccea1714973..8dfdb2a3440 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -122,7 +122,7 @@ = s_('AdminArea|Components') - if show_version_check? .float-right - .js-gitlab-version-check{ data: { "size": "lg" } } + .js-gitlab-version-check{ data: { "size": "lg", "actionable": "true" } } = link_to(sprite_icon('question'), "https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md", class: 'gl-ml-2', target: '_blank', rel: 'noopener noreferrer') %p = link_to _('GitLab'), general_admin_application_settings_path diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index eaa58580454..d12e51f2727 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -11,7 +11,7 @@ %span= link_to_version - if show_version_check? %span.gl-mt-5.gl-mb-3.gl-ml-3 - .js-gitlab-version-check{ data: { "size": "lg" } } + .js-gitlab-version-check{ data: { "size": "lg", "actionable": "true" } } %hr - unless Gitlab::CurrentSettings.help_page_hide_commercial_content? diff --git a/app/views/layouts/header/_gitlab_version.html.haml b/app/views/layouts/header/_gitlab_version.html.haml index fae6926a687..80020e27741 100644 --- a/app/views/layouts/header/_gitlab_version.html.haml +++ b/app/views/layouts/header/_gitlab_version.html.haml @@ -1,6 +1,14 @@ - return unless show_version_check? -%a{ class: 'gl-display-flex! gl-flex-direction-column gl-px-4! gl-py-3! gl-line-height-24!', href: help_page_path('update/index'), 'data-testid': 'gitlab-version-container' } +%a{ + class: 'gl-display-flex! gl-flex-direction-column gl-px-4! gl-py-3! gl-line-height-24!', + href: help_page_path('update/index'), + data: { + testid: 'gitlab-version-container', + track_action: 'click_version_help_dropdown', + track_label: "#{Gitlab.version_info.major}.#{Gitlab.version_info.minor}" + } + } %span = s_("VersionCheck|Your GitLab Version") = emoji_icon('rocket') diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 23a0d824bfe..efc1e23d9b4 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -1,3 +1,4 @@ +- add_page_specific_style 'page_bundles/notifications' - page_title _('Notifications') - @content_class = "limit-container-width" unless fluid_layout diff --git a/app/views/projects/deployments/_rollback.haml b/app/views/projects/deployments/_rollback.haml index 223f7520b47..e50fa1fa0f7 100644 --- a/app/views/projects/deployments/_rollback.haml +++ b/app/views/projects/deployments/_rollback.haml @@ -1,4 +1,4 @@ -- if deployment.deployable && can?(current_user, :create_deployment, deployment) +- if deployment.deployable && can?(current_user, :play_job, deployment.deployable) - tooltip = deployment.last? ? s_('Environments|Re-deploy to environment') : s_('Environments|Rollback environment') - icon = deployment.last? ? 'repeat' : 'redo' = render Pajamas::ButtonComponent.new(icon: icon, button_options: { title: tooltip, class: 'js-confirm-rollback-modal-button has-tooltip', data: { environment_name: @environment.name, commit_short_sha: deployment.short_sha, commit_url: project_commit_path(@project, deployment.sha), is_last_deployment: deployment.last?.to_s, retry_path: retry_project_job_path(@environment.project, deployment.deployable) } }) |