From ca95fe0b55e6a350aeb978ecc7fbd31c44ab84f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Oct 2019 00:06:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../javascripts/boards/components/board_form.vue | 1 + app/helpers/projects_helper.rb | 2 +- .../header/_current_user_dropdown.html.haml | 3 ++- app/views/layouts/header/_help_dropdown.html.haml | 3 ++- .../_user_dropdown_contributing_link.html.haml | 5 ++--- ...add_issues_prometheus_alert_event_join_table.rb | 22 ++++++++++++++++++++++ db/schema.rb | 11 +++++++++++ doc/user/index.md | 2 +- doc/user/project/canary_deployments.md | 2 +- doc/user/project/index.md | 2 +- doc/user/project/integrations/prometheus.md | 2 +- doc/user/project/repository/web_editor.md | 2 +- spec/lib/gitlab/import_export/all_models.yml | 2 ++ 13 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20190905022045_add_issues_prometheus_alert_event_join_table.rb diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index ebf48cee2ae..34560560756 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -194,6 +194,7 @@ export default { ref="name" v-model="board.name" class="form-control" + data-qa-selector="board_name_field" type="text" :placeholder="__('Enter board name')" @keyup.enter="submit" diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index df4c992a046..16360c7139a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -168,7 +168,7 @@ module ProjectsHelper end def link_to_autodeploy_doc - link_to _('About auto deploy'), help_page_path('ci/autodeploy/index'), target: '_blank' + link_to _('About auto deploy'), help_page_path('autodevops/index.md#auto-deploy'), target: '_blank' end def autodeploy_flash_notice(branch_name) diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index b636725fabf..efe74ddd902 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -32,7 +32,8 @@ %li.d-md-none = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) - = render 'shared/user_dropdown_contributing_link' + %li.d-md-none + = render 'shared/user_dropdown_contributing_link' = render_if_exists 'shared/user_dropdown_instance_review' - if Gitlab.com? %li.js-canary-link.d-md-none diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index 41d7aa3741a..71977b23481 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -9,7 +9,8 @@ %li = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) - = render 'shared/user_dropdown_contributing_link' + %li + = render 'shared/user_dropdown_contributing_link' = render_if_exists 'shared/user_dropdown_instance_review' - if Gitlab.com? %li.js-canary-link diff --git a/app/views/shared/_user_dropdown_contributing_link.html.haml b/app/views/shared/_user_dropdown_contributing_link.html.haml index 564d21a39be..d4c3e11d051 100644 --- a/app/views/shared/_user_dropdown_contributing_link.html.haml +++ b/app/views/shared/_user_dropdown_contributing_link.html.haml @@ -1,3 +1,2 @@ -%li - = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do - = _("Contribute to GitLab") += link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do + = _("Contribute to GitLab") diff --git a/db/migrate/20190905022045_add_issues_prometheus_alert_event_join_table.rb b/db/migrate/20190905022045_add_issues_prometheus_alert_event_join_table.rb new file mode 100644 index 00000000000..861b97f0a09 --- /dev/null +++ b/db/migrate/20190905022045_add_issues_prometheus_alert_event_join_table.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class AddIssuesPrometheusAlertEventJoinTable < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + create_table :issues_prometheus_alert_events, id: false do |t| + t.references :issue, null: false, + index: false, # Uses the index below + foreign_key: { on_delete: :cascade } + t.references :prometheus_alert_event, null: false, + index: { name: 'issue_id_issues_prometheus_alert_events_index' }, + foreign_key: { on_delete: :cascade } + + t.timestamps_with_timezone + t.index [:issue_id, :prometheus_alert_event_id], + unique: true, name: 'issue_id_prometheus_alert_event_id_index' + end + end +end diff --git a/db/schema.rb b/db/schema.rb index eaba76f3f1a..81d19b9c8d0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1877,6 +1877,15 @@ ActiveRecord::Schema.define(version: 2019_09_29_180827) do t.index ["updated_by_id"], name: "index_issues_on_updated_by_id", where: "(updated_by_id IS NOT NULL)" end + create_table "issues_prometheus_alert_events", id: false, force: :cascade do |t| + t.bigint "issue_id", null: false + t.bigint "prometheus_alert_event_id", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.index ["issue_id", "prometheus_alert_event_id"], name: "issue_id_prometheus_alert_event_id_index", unique: true + t.index ["prometheus_alert_event_id"], name: "issue_id_issues_prometheus_alert_events_index" + end + create_table "jira_connect_installations", force: :cascade do |t| t.string "client_key" t.string "encrypted_shared_secret" @@ -4071,6 +4080,8 @@ ActiveRecord::Schema.define(version: 2019_09_29_180827) do add_foreign_key "issues", "users", column: "author_id", name: "fk_05f1e72feb", on_delete: :nullify add_foreign_key "issues", "users", column: "closed_by_id", name: "fk_c63cbf6c25", on_delete: :nullify add_foreign_key "issues", "users", column: "updated_by_id", name: "fk_ffed080f01", on_delete: :nullify + add_foreign_key "issues_prometheus_alert_events", "issues", on_delete: :cascade + add_foreign_key "issues_prometheus_alert_events", "prometheus_alert_events", on_delete: :cascade add_foreign_key "jira_connect_subscriptions", "jira_connect_installations", on_delete: :cascade add_foreign_key "jira_connect_subscriptions", "namespaces", on_delete: :cascade add_foreign_key "jira_tracker_data", "services", on_delete: :cascade diff --git a/doc/user/index.md b/doc/user/index.md index e1833cab6b8..9b38447a9ae 100644 --- a/doc/user/index.md +++ b/doc/user/index.md @@ -88,7 +88,7 @@ it all at once, from one single project. Use built-in [GitLab CI/CD](../ci/README.md) to test, build, and deploy your applications directly from GitLab. No third-party integrations needed. -- [GitLab Auto Deploy](../ci/autodeploy/index.md): Deploy your application out-of-the-box with GitLab Auto Deploy. +- [GitLab Auto Deploy](../topics/autodevops/index.md#auto-deploy): Deploy your application out-of-the-box with GitLab Auto Deploy. - [Review Apps](../ci/review_apps/index.md): Live-preview the changes introduced by a merge request with Review Apps. - [GitLab Pages](project/pages/index.md): Publish your static site directly from GitLab with GitLab Pages. You can build, test, and deploy any Static Site Generator with Pages. diff --git a/doc/user/project/canary_deployments.md b/doc/user/project/canary_deployments.md index 95ed511d0b3..88205093d74 100644 --- a/doc/user/project/canary_deployments.md +++ b/doc/user/project/canary_deployments.md @@ -44,7 +44,7 @@ Canary deployments require that you properly configure Deploy Boards: 1. Follow the steps to [enable Deploy Boards](deploy_boards.md#enabling-deploy-boards). 1. To track canary deployments you need to label your Kubernetes deployments and - pods with `track: canary`. To get started quickly, you can use the [Auto Deploy](../../ci/autodeploy/index.md) + pods with `track: canary`. To get started quickly, you can use the [Auto Deploy](../../topics/autodevops/index.md#auto-deploy) template for canary deployments that GitLab provides. Depending on the deploy, the label should be either `stable` or `canary`. diff --git a/doc/user/project/index.md b/doc/user/project/index.md index de4db7c80ef..fff587027cf 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -62,7 +62,7 @@ When you create a project in GitLab, you'll have access to a large number of - [GitLab CI/CD](../../ci/README.md): GitLab's built-in [Continuous Integration, Delivery, and Deployment](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/) tool - [Container Registry](../packages/container_registry/index.md): Build and push Docker images out-of-the-box - - [Auto Deploy](../../ci/autodeploy/index.md): Configure GitLab CI/CD + - [Auto Deploy](../../topics/autodevops/index.md#auto-deploy): Configure GitLab CI/CD to automatically set up your app's deployment - [Enable and disable GitLab CI](../../ci/enable_or_disable_ci.md) - [Pipelines](../../ci/pipelines.md): Configure and visualize diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index e00923c3b9b..d7666d00e76 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -445,7 +445,7 @@ If the "No data found" screen continues to appear, it could be due to: [run a query](prometheus_library/kubernetes.html#metrics-supported), replacing `$CI_ENVIRONMENT_SLUG` with the name of your environment. -[autodeploy]: ../../../ci/autodeploy/index.md +[autodeploy]: ../../../topics/autodevops/index.md#auto-deploy [kubernetes]: https://kubernetes.io [kube]: ./kubernetes.md [prometheus-k8s-sd]: https://prometheus.io/docs/operating/configuration/# diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index a3cfa48e27e..944720c3863 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -117,7 +117,7 @@ the description field will automatically display the [issue closing pattern](../ merge request is merged. [project-services-doc]: ../integrations/project_services.md -[auto-deploy-doc]: ../../../ci/autodeploy/index.md +[auto-deploy-doc]: ../../../topics/autodevops/index.md#auto-deploy ### Create a new branch from a project's dashboard diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 50abd4b23e3..0b00ed9575d 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -25,6 +25,8 @@ issues: - epic - designs - design_versions +- prometheus_alerts +- prometheus_alert_events events: - author - project -- cgit v1.2.3