diff --git a/app/assets/javascripts/commons/polyfills.js b/app/assets/javascripts/commons/polyfills.js index 539d0d29e0d36f71ae403d82059cba63500862f6..bffc025ced35997331c8ecb8631af25eaea80641 100644 --- a/app/assets/javascripts/commons/polyfills.js +++ b/app/assets/javascripts/commons/polyfills.js @@ -5,6 +5,7 @@ import 'core-js/fn/array/find-index'; import 'core-js/fn/array/from'; import 'core-js/fn/array/includes'; import 'core-js/fn/object/assign'; +import 'core-js/fn/object/values'; import 'core-js/fn/promise'; import 'core-js/fn/string/code-point-at'; import 'core-js/fn/string/from-code-point'; diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index e69e56c85bed56a0e0e2b437b7e62d85e1197f79..59007d5950e0800a3d93bfce98f309129fa7d5e0 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -14,7 +14,7 @@ window.timeago = timeago; * * @param {Boolean} abbreviated */ -const getMonthNames = abbreviated => { +export const getMonthNames = abbreviated => { if (abbreviated) { return [ s__('Jan'), diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 016fee862e81a4f226d841947e8aa66c1ed300a6..f4540146a25746ff728356367397bd7e311c4631 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -641,3 +641,8 @@ Modals $modal-body-height: 134px; $priority-label-empty-state-width: 114px; + +/* +Issues Analytics +*/ +$issues-analytics-popover-boarder-color: rgba(0, 0, 0, 0.15); diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 163556f4509eb3add665847ae83ff46f85277e3c..b390c396a09ed6365be843fb1cd5b87c7ba9adbe 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -74,6 +74,8 @@ %span = boards_link_text + = render_if_exists 'layouts/nav/issues_analytics_link' + - if group_sidebar_link?(:labels) = nav_link(path: 'labels#index') do = link_to group_labels_path(@group), title: _('Labels') do diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 0d2f6bb77d670b8162b932773e3a520d50129e2b..f0d1dd162dfca7398b567f04e361b8ce8f9f27b6 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -10,7 +10,7 @@ -# haml-lint:disable InlineJavaScript %script#js-board-template{ type: "text/x-template" }= render "shared/boards/components/board" - %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal + %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal, show_sorting_dropdown: false %script#js-board-promotion{ type: "text/x-template" }= render_if_exists "shared/promotions/promote_issue_board" #board-app.boards-app{ "v-cloak" => true, data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" } diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index d27f79dc404919e4e3bf75a6a36dcf4eb98d83ab..95f32bd01800f37b2e34c3b7aad1b7d6f4d0ba4e 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -3,6 +3,7 @@ - block_css_class = type != :boards_modal ? 'row-content-block second-block' : '' - full_path = @project.present? ? @project.full_path : @group.full_path - user_can_admin_list = board && can?(current_user, :admin_list, board.parent) +- show_sorting_dropdown = local_assigns.fetch(:show_sorting_dropdown, true) .issues-filters .issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal } @@ -140,5 +141,5 @@ - if @project #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } } #js-toggle-focus-btn - - elsif type != :boards_modal + - elsif show_sorting_dropdown = render 'shared/sort_dropdown' diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb index 0b32a461d56b1291ee73414dcbb3e9c48c00f48d..16243b72f9a6f3f9094132d279fc2e5ae3a04483 100644 --- a/db/fixtures/development/09_issues.rb +++ b/db/fixtures/development/09_issues.rb @@ -8,7 +8,8 @@ Gitlab::Seeder.quiet do description: FFaker::Lorem.sentence, state: ['opened', 'closed'].sample, milestone: project.milestones.sample, - assignees: [project.team.users.sample] + assignees: [project.team.users.sample], + created_at: rand(12).months.ago } Issues::CreateService.new(project, project.team.users.sample, issue_params).execute