Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
		
							parent
							
								
									d2b53bd722
								
							
						
					
					
						commit
						e380e59ef5
					
				| 
						 | 
				
			
			@ -0,0 +1,15 @@
 | 
			
		|||
<script>
 | 
			
		||||
import { GlFormInput, GlFormGroup } from '@gitlab/ui';
 | 
			
		||||
 | 
			
		||||
export default {
 | 
			
		||||
  components: {
 | 
			
		||||
    GlFormInput,
 | 
			
		||||
    GlFormGroup,
 | 
			
		||||
  },
 | 
			
		||||
};
 | 
			
		||||
</script>
 | 
			
		||||
<template>
 | 
			
		||||
  <gl-form-group :label="__('Title')" label-for="title-field-edit">
 | 
			
		||||
    <gl-form-input id="title-field-edit" v-bind="$attrs" v-on="$listeners" />
 | 
			
		||||
  </gl-form-group>
 | 
			
		||||
</template>
 | 
			
		||||
| 
						 | 
				
			
			@ -2,6 +2,7 @@
 | 
			
		|||
 | 
			
		||||
class PrometheusAlert < ApplicationRecord
 | 
			
		||||
  include Sortable
 | 
			
		||||
  include UsageStatistics
 | 
			
		||||
 | 
			
		||||
  OPERATORS_MAP = {
 | 
			
		||||
    lt: "<",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
---
 | 
			
		||||
title: Add unlock_membership_to_ldap boolean to Groups
 | 
			
		||||
merge_request: 26474
 | 
			
		||||
author:
 | 
			
		||||
type: added
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
---
 | 
			
		||||
title: Added Edit Title shared component
 | 
			
		||||
merge_request: 27582
 | 
			
		||||
author:
 | 
			
		||||
type: added
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
---
 | 
			
		||||
title: Optimize projects_reporting_ci_cd_back_to_github query performance for usage data
 | 
			
		||||
merge_request: 27533
 | 
			
		||||
author:
 | 
			
		||||
type: performance
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			@ -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"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
 | 
			
		||||
 | 
			
		||||
exports[`Title edit field matches the snapshot 1`] = `
 | 
			
		||||
<gl-form-group-stub
 | 
			
		||||
  label="Title"
 | 
			
		||||
  label-for="title-field-edit"
 | 
			
		||||
>
 | 
			
		||||
  <gl-form-input-stub
 | 
			
		||||
    id="title-field-edit"
 | 
			
		||||
  />
 | 
			
		||||
</gl-form-group-stub>
 | 
			
		||||
`;
 | 
			
		||||
| 
						 | 
				
			
			@ -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();
 | 
			
		||||
  });
 | 
			
		||||
});
 | 
			
		||||
		Loading…
	
		Reference in New Issue