diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/views/dashboard | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
download | gitlab-ce-7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0.tar.gz |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/views/dashboard')
-rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/issues.html.haml | 25 | ||||
-rw-r--r-- | app/views/dashboard/todos/_todo.html.haml | 3 |
3 files changed, 18 insertions, 12 deletions
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 813c1cdbfe4..1c82b30ed8d 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -8,7 +8,7 @@ .top-area = gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do = gl_tab_link_to _("Your groups"), dashboard_groups_path - = gl_tab_link_to _("Explore public groups"), explore_groups_path + = gl_tab_link_to _("Explore public groups"), explore_groups_path, data: { qa_selector: "public_groups_tab" } .nav-controls = render 'shared/groups/search_form' = render 'shared/groups/dropdown' diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 95e772f324b..79f6bfc866a 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,6 +1,7 @@ - @hide_top_links = true - page_title _("Issues") - @breadcrumb_link = issues_dashboard_path(assignee_username: current_user.username) +- add_page_specific_style 'page_bundles/dashboard' = content_for :meta_tags do = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues") @@ -13,14 +14,20 @@ .page-title-controls = render 'shared/new_project_item_select', path: 'issues/new', label: _("issue"), with_feature_enabled: 'issues', type: :issues -.top-area - = render 'shared/issuable/nav', type: :issues, display_count: !@no_filters_set - .nav-controls - = render 'shared/issuable/feed_buttons' +- if ::Feature.enabled?(:vue_issues_dashboard) + .js-issues-dashboard{ data: { calendar_path: url_for(safe_params.merge(calendar_url_options)), + empty_state_svg_path: image_path('illustrations/issue-dashboard_results-without-filter.svg'), + is_signed_in: current_user.present?.to_s, + rss_path: url_for(safe_params.merge(rss_url_options)) } } +- else + .top-area + = render 'shared/issuable/nav', type: :issues, display_count: !@no_filters_set + .nav-controls + = render 'shared/issuable/feed_buttons' -= render 'shared/issuable/search_bar', type: :issues + = render 'shared/issuable/search_bar', type: :issues -- if current_user && @no_filters_set - = render 'shared/dashboard/no_filter_selected' -- else - = render 'shared/issues' + - if current_user && @no_filters_set + = render 'shared/dashboard/no_filter_selected' + - else + = render 'shared/issues' diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml index b4668b1e52a..47bc8f5c95b 100644 --- a/app/views/dashboard/todos/_todo.html.haml +++ b/app/views/dashboard/todos/_todo.html.haml @@ -27,8 +27,7 @@ = todo_target_title(todo) %span.title-item.todo-project.todo-label - at - = todo_parent_path(todo) + = s_('Todo|at %{todo_parent_path}').html_safe % { todo_parent_path: todo_parent_path(todo) } - if todo.self_assigned? %span.title-item.action-name |