Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
daa5663fbe
commit
2cfa1fc75d
|
@ -1,4 +1,4 @@
|
|||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33"
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33"
|
||||
|
||||
stages:
|
||||
- sync
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
- .default-before_script
|
||||
- .assets-compile-cache
|
||||
- .only:changes-code-backstage-qa
|
||||
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1
|
||||
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1
|
||||
stage: prepare
|
||||
services:
|
||||
- docker:19.03.0-dind
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
# Jobs that only need to pull cache
|
||||
.default-cache:
|
||||
cache:
|
||||
key: "debian-stretch-ruby-2.6.3-node-12.x"
|
||||
key: "debian-stretch-ruby-2.6.5-node-12.x"
|
||||
paths:
|
||||
- .go/pkg/mod
|
||||
- vendor/ruby
|
||||
|
@ -202,7 +202,7 @@
|
|||
- name: redis:alpine
|
||||
|
||||
.use-pg10:
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
|
||||
services:
|
||||
- name: postgres:10.9
|
||||
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
|
||||
|
@ -216,7 +216,7 @@
|
|||
- name: elasticsearch:5.6.12
|
||||
|
||||
.use-pg10-ee:
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
|
||||
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
|
||||
services:
|
||||
- name: postgres:10.9
|
||||
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
|
||||
|
|
|
@ -1 +1 @@
|
|||
2.6.3
|
||||
2.6.5
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update foreign key constraint for personal access tokens
|
||||
merge_request: 22305
|
||||
author:
|
||||
type: fixed
|
|
@ -0,0 +1,20 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class UpdatePersonalAccessTokensUserIdForeignKey < ActiveRecord::Migration[5.2]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
CONSTRAINT_NAME = 'fk_personal_access_tokens_user_id'
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
add_concurrent_foreign_key(:personal_access_tokens, :users, column: :user_id, on_delete: :cascade, name: CONSTRAINT_NAME)
|
||||
remove_foreign_key_if_exists(:personal_access_tokens, column: :user_id, on_delete: nil)
|
||||
end
|
||||
|
||||
def down
|
||||
add_concurrent_foreign_key(:personal_access_tokens, :users, column: :user_id, on_delete: nil)
|
||||
remove_foreign_key_if_exists(:personal_access_tokens, column: :user_id, on_delete: :cascade, name: CONSTRAINT_NAME)
|
||||
end
|
||||
end
|
|
@ -4687,7 +4687,7 @@ ActiveRecord::Schema.define(version: 2019_12_29_140154) do
|
|||
add_foreign_key "pages_domains", "projects", name: "fk_ea2f6dfc6f", on_delete: :cascade
|
||||
add_foreign_key "path_locks", "projects", name: "fk_5265c98f24", on_delete: :cascade
|
||||
add_foreign_key "path_locks", "users"
|
||||
add_foreign_key "personal_access_tokens", "users"
|
||||
add_foreign_key "personal_access_tokens", "users", name: "fk_personal_access_tokens_user_id", on_delete: :cascade
|
||||
add_foreign_key "plan_limits", "plans", on_delete: :cascade
|
||||
add_foreign_key "pool_repositories", "projects", column: "source_project_id", on_delete: :nullify
|
||||
add_foreign_key "pool_repositories", "shards", on_delete: :restrict
|
||||
|
|
|
@ -121,7 +121,6 @@ This example code does the following:
|
|||
- Installs the Serverless Framework.
|
||||
- Deploys the serverless function to your AWS account using the AWS credentials
|
||||
defined above.
|
||||
- Deploys the serverless function to your AWS account using the AWS credentials defined above
|
||||
|
||||
### Setting up your AWS credentials with your GitLab account
|
||||
|
||||
|
|
Loading…
Reference in New Issue