diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 16:05:00 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-08 16:05:00 +0300 |
| commit | c3cf32e863b47d98d6e1d2d3ed78745ddf2ccb79 (patch) | |
| tree | ee9eaaeabf247a882701100e5dbac36120c80a8a /db/schema.rb | |
| parent | 6c32abc5f7f090d4932054e5cc1ff0594edd5ff1 (diff) | |
| parent | edf0a0715b56a50fd1ac8ac505333f7e6fa4384c (diff) | |
| download | gitlab-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/schema.rb')
| -rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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" |