summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-08 16:05:00 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-08 16:05:00 +0300
commitc3cf32e863b47d98d6e1d2d3ed78745ddf2ccb79 (patch)
treeee9eaaeabf247a882701100e5dbac36120c80a8a /db
parent6c32abc5f7f090d4932054e5cc1ff0594edd5ff1 (diff)
parentedf0a0715b56a50fd1ac8ac505333f7e6fa4384c (diff)
downloadgitlab-ce-c3cf32e863b47d98d6e1d2d3ed78745ddf2ccb79.tar.gz
Merge branch 'version-check' into gl-version-check
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20150310194358_add_version_check_to_application_settings.rb5
-rw-r--r--db/schema.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20150310194358_add_version_check_to_application_settings.rb b/db/migrate/20150310194358_add_version_check_to_application_settings.rb
new file mode 100644
index 00000000000..e9d42c1e749
--- /dev/null
+++ b/db/migrate/20150310194358_add_version_check_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddVersionCheckToApplicationSettings < ActiveRecord::Migration
+ def change
+ add_column :application_settings, :version_check_enabled, :boolean, default: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 04abf9bb9a6..1fe092ec5d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -28,6 +28,7 @@ ActiveRecord::Schema.define(version: 20150502064022) do
t.integer "default_branch_protection", default: 2
t.boolean "twitter_sharing_enabled", default: true
t.text "restricted_visibility_levels"
+ t.boolean "version_check_enabled", default: true
t.integer "max_attachment_size", default: 10, null: false
t.integer "default_project_visibility"
t.integer "default_snippet_visibility"