diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-09-14 20:38:32 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-09-14 20:38:32 +0800 |
| commit | ba84a428287a16e99bd0239bccc20c5a786d3549 (patch) | |
| tree | ec3007c0151c95589aca1ca95f87c1ccd2fd2bf6 /db | |
| parent | 15bb44fc6357ca57e344d7b4818ac74ffb0a4dea (diff) | |
| parent | 72e9f63ff722585ba75abbf4635f649e88709a70 (diff) | |
| download | gitlab-ce-ba84a428287a16e99bd0239bccc20c5a786d3549.tar.gz | |
Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (64 commits)
Update the 8.11 to 8.12 update documentation to use gitlab-shell 3.5.0
Update GITLAB_SHELL_VERSION
Move pushes_since_gc to Redis
Fix Gitlab::Popen.popen thread-safety issue
Allow trailing newline in secret base64 data
Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entry
Fix a typo in documentation
Restore SSH Key title auto-population behavior
Add test with inactive error use case for 'POST /ci/api/v1/builds/register.json'
Fix rubocop offences
Update API documentation
Update CHANGELOG
Change response for /ci/api/v1/builds/register.json from 404 to 204
Document the fact that merge requests from private forks can be checked out locally
Change method name to #reopenable?
Improve grammar
Fix not working test with execute
Add CHANGELOG
Improve grammar
Add #can_reopen? and tests
...
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20160913162434_remove_projects_pushes_since_gc.rb | 19 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb b/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb new file mode 100644 index 00000000000..c5b8c35e961 --- /dev/null +++ b/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb @@ -0,0 +1,19 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class RemoveProjectsPushesSinceGc < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = true + DOWNTIME_REASON = 'This migration removes an existing column' + + disable_ddl_transaction! + + def up + remove_column :projects, :pushes_since_gc + end + + def down + add_column_with_default! :projects, :pushes_since_gc, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 5c283141084..61873e38113 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160902122721) do +ActiveRecord::Schema.define(version: 20160913162434) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -824,7 +824,6 @@ ActiveRecord::Schema.define(version: 20160902122721) do t.integer "build_timeout", default: 3600, null: false t.boolean "pending_delete", default: false t.boolean "public_builds", default: true, null: false - t.integer "pushes_since_gc", default: 0 t.boolean "last_repository_check_failed" t.datetime "last_repository_check_at" t.boolean "container_registry_enabled" |