Commit 89f1e4b6 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'issue_7478' into 'master'

CE backport - Chart showing issues created per month

See merge request gitlab-org/gitlab-ce!22793
parents 24d3486f 6e911a11
...@@ -5,6 +5,7 @@ import 'core-js/fn/array/find-index'; ...@@ -5,6 +5,7 @@ import 'core-js/fn/array/find-index';
import 'core-js/fn/array/from'; import 'core-js/fn/array/from';
import 'core-js/fn/array/includes'; import 'core-js/fn/array/includes';
import 'core-js/fn/object/assign'; import 'core-js/fn/object/assign';
import 'core-js/fn/object/values';
import 'core-js/fn/promise'; import 'core-js/fn/promise';
import 'core-js/fn/string/code-point-at'; import 'core-js/fn/string/code-point-at';
import 'core-js/fn/string/from-code-point'; import 'core-js/fn/string/from-code-point';
......
...@@ -14,7 +14,7 @@ window.timeago = timeago; ...@@ -14,7 +14,7 @@ window.timeago = timeago;
* *
* @param {Boolean} abbreviated * @param {Boolean} abbreviated
*/ */
const getMonthNames = abbreviated => { export const getMonthNames = abbreviated => {
if (abbreviated) { if (abbreviated) {
return [ return [
s__('Jan'), s__('Jan'),
......
...@@ -641,3 +641,8 @@ Modals ...@@ -641,3 +641,8 @@ Modals
$modal-body-height: 134px; $modal-body-height: 134px;
$priority-label-empty-state-width: 114px; $priority-label-empty-state-width: 114px;
/*
Issues Analytics
*/
$issues-analytics-popover-boarder-color: rgba(0, 0, 0, 0.15);
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
%span %span
= boards_link_text = boards_link_text
= render_if_exists 'layouts/nav/issues_analytics_link'
- if group_sidebar_link?(:labels) - if group_sidebar_link?(:labels)
= nav_link(path: 'labels#index') do = nav_link(path: 'labels#index') do
= link_to group_labels_path(@group), title: _('Labels') do = link_to group_labels_path(@group), title: _('Labels') do
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
-# haml-lint:disable InlineJavaScript -# haml-lint:disable InlineJavaScript
%script#js-board-template{ type: "text/x-template" }= render "shared/boards/components/board" %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" %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 }" } #board-app.boards-app{ "v-cloak" => true, data: board_data, ":class" => "{ 'is-compact': detailIssueVisible }" }
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
- block_css_class = type != :boards_modal ? 'row-content-block second-block' : '' - block_css_class = type != :boards_modal ? 'row-content-block second-block' : ''
- full_path = @project.present? ? @project.full_path : @group.full_path - full_path = @project.present? ? @project.full_path : @group.full_path
- user_can_admin_list = board && can?(current_user, :admin_list, board.parent) - 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-filters
.issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal } .issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal }
...@@ -140,5 +141,5 @@ ...@@ -140,5 +141,5 @@
- if @project - if @project
#js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } } #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } }
#js-toggle-focus-btn #js-toggle-focus-btn
- elsif type != :boards_modal - elsif show_sorting_dropdown
= render 'shared/sort_dropdown' = render 'shared/sort_dropdown'
...@@ -8,7 +8,8 @@ Gitlab::Seeder.quiet do ...@@ -8,7 +8,8 @@ Gitlab::Seeder.quiet do
description: FFaker::Lorem.sentence, description: FFaker::Lorem.sentence,
state: ['opened', 'closed'].sample, state: ['opened', 'closed'].sample,
milestone: project.milestones.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 Issues::CreateService.new(project, project.team.users.sample, issue_params).execute
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment