diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/dashboard/todos/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/_pipeline_tour_success.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 9b6150c4be2..939a67d1384 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -3,6 +3,7 @@ - header_title _("To-Do List"), dashboard_todos_path = render_dashboard_gold_trial(current_user) += stylesheet_link_tag 'page_bundles/todos' .page-title-holder.d-flex.align-items-center %h1.page-title= _('To-Do List') diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 973b79f4f64..aee8eb02af5 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -68,7 +68,7 @@ = yield :page_specific_javascripts = webpack_controller_bundle_tags - = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<85"]) || browser.edge?([">=84", "<85"]) + = webpack_bundle_tag "chrome_84_icon_fix" if browser.chrome?([">=84", "<84.0.4147.125"]) || browser.edge?([">=84", "<84.0.522.59"]) = yield :project_javascripts diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 8a05768109b..a6fc50ffa0b 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -87,7 +87,7 @@ - if has_impersonation_link %li.nav-item.impersonation.ml-0 = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body', qa_selector: 'stop_impersonation_link' } do - = icon('user-secret') + = sprite_icon('incognito', size: 18) - if header_link?(:sign_in) %li.nav-item %div diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 787dc3b030f..cea65bf9b4e 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -23,6 +23,7 @@ .js-suggest-gitlab-ci-yml{ data: { toggle: 'popover', target: '#gitlab-ci-yml-selector', track_label: 'suggest_gitlab_ci_yml', + merge_request_path: params[:mr_path], dismiss_key: @project.id, human_access: human_access } } diff --git a/app/views/projects/blob/_pipeline_tour_success.html.haml b/app/views/projects/blob/_pipeline_tour_success.html.haml index cf1427df044..3ea2defb2b3 100644 --- a/app/views/projects/blob/_pipeline_tour_success.html.haml +++ b/app/views/projects/blob/_pipeline_tour_success.html.haml @@ -1,3 +1,4 @@ .js-success-pipeline-modal{ data: { 'commit-cookie': suggest_pipeline_commit_cookie_name, 'go-to-pipelines-path': project_pipelines_path(@project), + 'project-merge-requests-path': project_merge_requests_path(@project), 'human-access': @project.team.human_max_access(current_user&.id) } } diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 48ffd80aa9c..a939f43d5e2 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -15,6 +15,7 @@ - if should_suggest_gitlab_ci_yml? .js-suggest-gitlab-ci-yml-commit-changes{ data: { toggle: 'popover', target: '#commit-changes', + merge_request_path: params[:mr_path], track_label: 'suggest_commit_first_project_gitlab_ci_yml', dismiss_key: @project.id, human_access: human_access } } |