diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 15:08:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 15:08:11 +0300 |
commit | badb9c1deacbea601b02f88811b7e123589d9251 (patch) | |
tree | f4b4f85db49a8c9fc9bd6233ed9f7862c9de8ded /app | |
parent | 5bd24a54ef4ce3a38a860eb53b66d062c2382971 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/boards/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/stores/state.js | 1 | ||||
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/asana_service.rb | 2 | ||||
-rw-r--r-- | app/services/metrics/dashboard/pod_dashboard_service.rb | 10 | ||||
-rw-r--r-- | app/views/shared/boards/_show.html.haml | 1 |
6 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js index 0d10c896a47..f1b481fc386 100644 --- a/app/assets/javascripts/boards/index.js +++ b/app/assets/javascripts/boards/index.js @@ -68,6 +68,8 @@ export default () => { Board, BoardSidebar, BoardAddIssuesModal, + BoardSettingsSidebar: () => + import('ee_component/boards/components/board_settings_sidebar.vue'), }, store, data: { diff --git a/app/assets/javascripts/boards/stores/state.js b/app/assets/javascripts/boards/stores/state.js index 24f44dc5629..731aea996fb 100644 --- a/app/assets/javascripts/boards/stores/state.js +++ b/app/assets/javascripts/boards/stores/state.js @@ -1,3 +1,4 @@ export default () => ({ isShowingLabels: true, + activeListId: 0, }); diff --git a/app/models/project.rb b/app/models/project.rb index bc8757ea888..cfdcdbed502 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -334,7 +334,7 @@ class Project < ApplicationRecord delegate :add_guest, :add_reporter, :add_developer, :add_maintainer, :add_role, to: :team delegate :add_master, to: :team # @deprecated delegate :group_runners_enabled, :group_runners_enabled=, :group_runners_enabled?, to: :ci_cd_settings - delegate :root_ancestor, to: :namespace, allow_nil: true + delegate :root_ancestor, :actual_limits, to: :namespace, allow_nil: true delegate :last_pipeline, to: :commit, allow_nil: true delegate :external_dashboard_url, to: :metrics_setting, allow_nil: true, prefix: true delegate :default_git_depth, :default_git_depth=, to: :ci_cd_settings, prefix: :ci diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb index 757b2f17fb9..c4fcdcc05c5 100644 --- a/app/models/project_services/asana_service.rb +++ b/app/models/project_services/asana_service.rb @@ -24,7 +24,7 @@ get the commit comment added to it. You can also close a task with a message containing: `fix #123456`. You can create a Personal Access Token here: -http://app.asana.com/-/account_api' +https://app.asana.com/0/developer-console' end def self.to_param diff --git a/app/services/metrics/dashboard/pod_dashboard_service.rb b/app/services/metrics/dashboard/pod_dashboard_service.rb new file mode 100644 index 00000000000..16b87d2d587 --- /dev/null +++ b/app/services/metrics/dashboard/pod_dashboard_service.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +module Metrics + module Dashboard + class PodDashboardService < ::Metrics::Dashboard::PredefinedDashboardService + DASHBOARD_PATH = 'config/prometheus/pod_metrics.yml' + DASHBOARD_NAME = 'Pod Health' + end + end +end diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 93fc839a371..7f62b983bfc 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -29,6 +29,7 @@ ":board-id" => "boardId", ":key" => "list.id" } = render "shared/boards/components/sidebar", group: group + = render_if_exists 'shared/boards/components/board_settings_sidebar' - if @project %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project), "milestone-path" => milestones_filter_dropdown_path, |