Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-11-05 18:32:14 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-11-05 18:32:14 +0300
commit487820ad50be2877135d18380baa87a2de762d45 (patch)
tree9d050b7f71f07f3e0869edd316c3793578dea770 /db
parentc12a4a9ac7c04a215adf6062fec7bf31231c7d4a (diff)
parent40397f35771a37a772f86e00d7dc708ddc6d3544 (diff)
Merge branch 'disallow-retry-of-old-builds' into 'master'
Disallow retry of old builds Closes #50939 See merge request gitlab-org/gitlab-ce!22538
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20181023104858_add_archive_builds_duration_to_application_settings.rb11
-rw-r--r--db/schema.rb1
2 files changed, 12 insertions, 0 deletions
diff --git a/db/migrate/20181023104858_add_archive_builds_duration_to_application_settings.rb b/db/migrate/20181023104858_add_archive_builds_duration_to_application_settings.rb
new file mode 100644
index 00000000000..744748b3fad
--- /dev/null
+++ b/db/migrate/20181023104858_add_archive_builds_duration_to_application_settings.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddArchiveBuildsDurationToApplicationSettings < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ def change
+ add_column(:application_settings, :archive_builds_in_seconds, :integer, allow_null: true)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d1815687968..5ad8fb7c5a4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -165,6 +165,7 @@ ActiveRecord::Schema.define(version: 20181101144347) do
t.integer "usage_stats_set_by_user_id"
t.integer "receive_max_input_size"
t.integer "diff_max_patch_bytes", default: 102400, null: false
+ t.integer "archive_builds_in_seconds"
end
create_table "audit_events", force: :cascade do |t|