Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2cfa1fc7
Commit
2cfa1fc7
authored
Jan 03, 2020
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/gitlab@master
parent
daa5663f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
8 deletions
+32
-8
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
.gitlab/ci/frontend.gitlab-ci.yml
.gitlab/ci/frontend.gitlab-ci.yml
+1
-1
.gitlab/ci/global.gitlab-ci.yml
.gitlab/ci/global.gitlab-ci.yml
+3
-3
.ruby-version
.ruby-version
+1
-1
changelogs/unreleased/sh-update-foreign-key-personal-access-tokens.yml
...released/sh-update-foreign-key-personal-access-tokens.yml
+5
-0
db/migrate/20191227140254_update_personal_access_tokens_user_id_foreign_key.rb
...0254_update_personal_access_tokens_user_id_foreign_key.rb
+20
-0
db/schema.rb
db/schema.rb
+1
-1
doc/user/project/clusters/serverless/aws.md
doc/user/project/clusters/serverless/aws.md
+0
-1
No files found.
.gitlab-ci.yml
View file @
2cfa1fc7
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
...
...
.gitlab/ci/frontend.gitlab-ci.yml
View file @
2cfa1fc7
...
...
@@ -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
...
...
.gitlab/ci/global.gitlab-ci.yml
View file @
2cfa1fc7
...
...
@@ -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"
]
...
...
.ruby-version
View file @
2cfa1fc7
2.6.
3
2.6.
5
changelogs/unreleased/sh-update-foreign-key-personal-access-tokens.yml
0 → 100644
View file @
2cfa1fc7
---
title
:
Update foreign key constraint for personal access tokens
merge_request
:
22305
author
:
type
:
fixed
db/migrate/20191227140254_update_personal_access_tokens_user_id_foreign_key.rb
0 → 100644
View file @
2cfa1fc7
# 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
db/schema.rb
View file @
2cfa1fc7
...
...
@@ -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
...
...
doc/user/project/clusters/serverless/aws.md
View file @
2cfa1fc7
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment