Merge branch '11889-gma-pat-expiry-db-changes' into 'master'

"Extend PAT expiration setting to GitLab.com" - Add necessary database column

See merge request gitlab-org/gitlab!27769

db/migrate/20200323075043_add_max_personal_access_token_lifetime_to_namespaces.rb

+# frozen_string_literal: true
+
+class AddMaxPersonalAccessTokenLifetimeToNamespaces < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column :namespaces, :max_personal_access_token_lifetime, :integer
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :namespaces, :max_personal_access_token_lifetime
+    end
+  end
+end

db/structure.sql

@@ -3944,7 +3944,8 @@ CREATE TABLE public.namespaces (
     max_artifacts_size integer,
     mentions_disabled boolean,
     default_branch_protection smallint,
-    unlock_membership_to_ldap boolean
+    unlock_membership_to_ldap boolean,
+    max_personal_access_token_lifetime integer
 );
 
 CREATE SEQUENCE public.namespaces_id_seq
@@ -12708,5 +12709,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20200318163148'),
 ('20200318164448'),
 ('20200318165448'),
-('20200319203901');
+('20200319203901'),
+('20200323075043');
 

ee/changelogs/unreleased/11889-gma-pat-expiry-db-changes.yml

+---
+title: Add a DB column to allow GMA groups to specify their PAT expiry setting
+merge_request: 27769
+author:
+type: added