From e380e59ef5d1aa03922df49626c302da5eb30699 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 20 Mar 2020 06:09:38 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../vue_shared/components/form/title.vue | 15 +++++++++++++ app/models/prometheus_alert.rb | 1 + ...ck-membership-to-ldap-column-to-groups.yml | 5 +++++ .../unreleased/207236-snippet-edit-title.yml | 5 +++++ ...counting-for-some-individual-queries-3.yml | 5 +++++ ...add_unlock_membership_to_ldap_of_groups.rb | 19 ++++++++++++++++ db/schema.rb | 1 + .../form/__snapshots__/title_spec.js.snap | 12 ++++++++++ .../vue_shared/components/form/title_spec.js | 22 +++++++++++++++++++ 9 files changed, 85 insertions(+) create mode 100644 app/assets/javascripts/vue_shared/components/form/title.vue create mode 100644 changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml create mode 100644 changelogs/unreleased/207236-snippet-edit-title.yml create mode 100644 changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml create mode 100644 db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb create mode 100644 spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap create mode 100644 spec/frontend/vue_shared/components/form/title_spec.js diff --git a/app/assets/javascripts/vue_shared/components/form/title.vue b/app/assets/javascripts/vue_shared/components/form/title.vue new file mode 100644 index 00000000000..f8f70529bd1 --- /dev/null +++ b/app/assets/javascripts/vue_shared/components/form/title.vue @@ -0,0 +1,15 @@ + + diff --git a/app/models/prometheus_alert.rb b/app/models/prometheus_alert.rb index 1dc7dc73e31..a1303f59129 100644 --- a/app/models/prometheus_alert.rb +++ b/app/models/prometheus_alert.rb @@ -2,6 +2,7 @@ class PrometheusAlert < ApplicationRecord include Sortable + include UsageStatistics OPERATORS_MAP = { lt: "<", diff --git a/changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml b/changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml new file mode 100644 index 00000000000..9dc31cdf187 --- /dev/null +++ b/changelogs/unreleased/1793-add-unlock-membership-to-ldap-column-to-groups.yml @@ -0,0 +1,5 @@ +--- +title: Add unlock_membership_to_ldap boolean to Groups +merge_request: 26474 +author: +type: added diff --git a/changelogs/unreleased/207236-snippet-edit-title.yml b/changelogs/unreleased/207236-snippet-edit-title.yml new file mode 100644 index 00000000000..b70a87e6c0d --- /dev/null +++ b/changelogs/unreleased/207236-snippet-edit-title.yml @@ -0,0 +1,5 @@ +--- +title: Added Edit Title shared component +merge_request: 27582 +author: +type: added diff --git a/changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml b/changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml new file mode 100644 index 00000000000..740d21cc0da --- /dev/null +++ b/changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries-3.yml @@ -0,0 +1,5 @@ +--- +title: Optimize projects_reporting_ci_cd_back_to_github query performance for usage data +merge_request: 27533 +author: +type: performance diff --git a/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb b/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb new file mode 100644 index 00000000000..2aa58c92c3e --- /dev/null +++ b/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddUnlockMembershipToLdapOfGroups < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column(:namespaces, :unlock_membership_to_ldap, :boolean) + end + end + + def down + with_lock_retries do + remove_column :namespaces, :unlock_membership_to_ldap + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4fd4d839b31..2ecc0b9b2d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2787,6 +2787,7 @@ ActiveRecord::Schema.define(version: 2020_03_19_203901) do t.integer "max_artifacts_size" t.boolean "mentions_disabled" t.integer "default_branch_protection", limit: 2 + t.boolean "unlock_membership_to_ldap" t.index ["created_at"], name: "index_namespaces_on_created_at" t.index ["custom_project_templates_group_id", "type"], name: "index_namespaces_on_custom_project_templates_group_id_and_type", where: "(custom_project_templates_group_id IS NOT NULL)" t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id" diff --git a/spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap b/spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap new file mode 100644 index 00000000000..980e9b517db --- /dev/null +++ b/spec/frontend/vue_shared/components/form/__snapshots__/title_spec.js.snap @@ -0,0 +1,12 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Title edit field matches the snapshot 1`] = ` + + + +`; diff --git a/spec/frontend/vue_shared/components/form/title_spec.js b/spec/frontend/vue_shared/components/form/title_spec.js new file mode 100644 index 00000000000..38ef1bb3aa7 --- /dev/null +++ b/spec/frontend/vue_shared/components/form/title_spec.js @@ -0,0 +1,22 @@ +import TitleField from '~/vue_shared/components/form/title.vue'; +import { shallowMount } from '@vue/test-utils'; + +describe('Title edit field', () => { + let wrapper; + + function createComponent() { + wrapper = shallowMount(TitleField); + } + + beforeEach(() => { + createComponent(); + }); + + afterEach(() => { + wrapper.destroy(); + }); + + it('matches the snapshot', () => { + expect(wrapper.element).toMatchSnapshot(); + }); +});