Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

8 files changed, 292 insertions, 285 deletions

diff --git a/CHANGELOG-EE b/CHANGELOG-EE
index 4eaecef2f15..21dc79539d5 100644
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -1,5 +1,6 @@
 v 8.4.0 (unreleased)
   - Add ability to create a note for user by admin
+  - Fix "Commit was rejected by git hook", when max_file_size was set null in project's Git hooks
 
 v 8.3.0
   - License information can now be retrieved via the API
diff --git a/app/models/git_hook.rb b/app/models/git_hook.rb
index 1de3116b621..93f77ec419c 100644
--- a/app/models/git_hook.rb
+++ b/app/models/git_hook.rb
@@ -2,6 +2,7 @@ class GitHook < ActiveRecord::Base
   belongs_to :project
 
   validates :project, presence: true, unless: "is_sample?"
+  validates :max_file_size, numericality: { greater_than_or_equal_to: 0, only_integer: true }
 
   def commit_validation?
     commit_message_regex.present? ||
diff --git a/app/views/admin/git_hooks/index.html.haml b/app/views/admin/git_hooks/index.html.haml
index 4b8703bd835..2bfad520e7b 100644
--- a/app/views/admin/git_hooks/index.html.haml
+++ b/app/views/admin/git_hooks/index.html.haml
@@ -2,7 +2,7 @@
 %h3.page-title
   Pre-defined git hooks.
 %p.light
-  Rules that define what git pushes are accepted for a project. All newly created projects will use this settings. Request new rules for free by creating an issue on the <a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/">GitLab EE issue tracker</a> and labeling it 'Feature proposal'.
+  Rules that define what git pushes are accepted for a project. All newly created projects will use this settings. Request new rules for free by creating an issue on the <a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/">GitLab EE issue tracker</a> and labeling it 'Feature proposal'. Or if you can please contribute a tested merge request.
 
 %hr.clearfix
 
diff --git a/app/views/projects/git_hooks/index.html.haml b/app/views/projects/git_hooks/index.html.haml
index b2ac40e0d87..fb1aded6131 100644
--- a/app/views/projects/git_hooks/index.html.haml
+++ b/app/views/projects/git_hooks/index.html.haml
@@ -2,7 +2,7 @@
 %h3.page-title
   Git hooks
 %p.light
-  Rules that define what git pushes are accepted for this project. Request new rules for free by creating an issue on the <a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/">GitLab EE issue tracker</a> and labeling it 'Feature proposal'.
+  Rules that define what git pushes are accepted for this project. Request new rules for free by creating an issue on the <a href="https://gitlab.com/gitlab-org/gitlab-ee/issues/">GitLab EE issue tracker</a> and labeling it 'Feature proposal'. Or if you can please contribute a tested merge request.
 
 %hr.clearfix
 
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 1774f7cf733..b09333f1d24 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -57,7 +57,6 @@
   - if issuable.respond_to?(:weight)
     .form-group
       = f.label :label_ids, class: 'control-label' do
-        = icon('magnet')
         Weight
       .col-sm-10
         = f.select :weight, projects_weight_options(issuable.weight), { include_blank: true },
diff --git a/db/migrate/20151228203337_change_max_file_size_to_not_null_on_git_hooks.rb b/db/migrate/20151228203337_change_max_file_size_to_not_null_on_git_hooks.rb
new file mode 100644
index 00000000000..4fc12038c77
--- /dev/null
+++ b/db/migrate/20151228203337_change_max_file_size_to_not_null_on_git_hooks.rb
@@ -0,0 +1,5 @@
+class ChangeMaxFileSizeToNotNullOnGitHooks < ActiveRecord::Migration
+  def change
+    change_column_null :git_hooks, :max_file_size, false, 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0d0bc22ea6a..0dd4ccaec72 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: 20151224123230) do
+ActiveRecord::Schema.define(version: 20151228203337) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -25,14 +25,14 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "appearances", force: :cascade do |t|
-    t.string   "title"
+    t.string   "title",       limit: 255
     t.text     "description"
-    t.string   "logo"
+    t.string   "logo",        limit: 255
     t.integer  "updated_by"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "dark_logo"
-    t.string   "light_logo"
+    t.string   "dark_logo",   limit: 255
+    t.string   "light_logo",  limit: 255
   end
 
   create_table "application_settings", force: :cascade do |t|
@@ -43,28 +43,28 @@ ActiveRecord::Schema.define(version: 20151224123230) do
     t.text     "sign_in_text"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "home_page_url"
-    t.integer  "default_branch_protection",         default: 2
-    t.boolean  "twitter_sharing_enabled",           default: true
+    t.string   "home_page_url",                     limit: 255
+    t.integer  "default_branch_protection",                     default: 2
+    t.boolean  "twitter_sharing_enabled",                       default: true
     t.text     "help_text"
     t.text     "restricted_visibility_levels"
-    t.boolean  "version_check_enabled",             default: true
-    t.integer  "max_attachment_size",               default: 10,    null: false
+    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"
     t.text     "restricted_signup_domains"
-    t.boolean  "user_oauth_applications",           default: true
-    t.string   "after_sign_out_path"
-    t.integer  "session_expire_delay",              default: 10080, null: false
+    t.boolean  "user_oauth_applications",                       default: true
+    t.string   "after_sign_out_path",               limit: 255
+    t.integer  "session_expire_delay",                          default: 10080, null: false
     t.text     "import_sources"
     t.text     "help_page_text"
-    t.string   "admin_notification_email"
-    t.boolean  "shared_runners_enabled",            default: true,  null: false
-    t.integer  "max_artifacts_size",                default: 100,   null: false
+    t.string   "admin_notification_email",          limit: 255
+    t.boolean  "shared_runners_enabled",                        default: true,  null: false
+    t.integer  "max_artifacts_size",                            default: 100,   null: false
     t.string   "runners_registration_token"
-    t.integer  "max_pages_size",                    default: 100,   null: false
-    t.boolean  "require_two_factor_authentication", default: false
-    t.integer  "two_factor_grace_period",           default: 48
+    t.integer  "max_pages_size",                                default: 100,   null: false
+    t.boolean  "require_two_factor_authentication",             default: false
+    t.integer  "two_factor_grace_period",                       default: 48
   end
 
   create_table "approvals", force: :cascade do |t|
@@ -75,9 +75,9 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "approvers", force: :cascade do |t|
-    t.integer  "target_id",   null: false
-    t.string   "target_type"
-    t.integer  "user_id",     null: false
+    t.integer  "target_id",               null: false
+    t.string   "target_type", limit: 255
+    t.integer  "user_id",                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -86,10 +86,10 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "approvers", ["user_id"], name: "index_approvers_on_user_id", using: :btree
 
   create_table "audit_events", force: :cascade do |t|
-    t.integer  "author_id",   null: false
-    t.string   "type",        null: false
-    t.integer  "entity_id",   null: false
-    t.string   "entity_type", null: false
+    t.integer  "author_id",               null: false
+    t.string   "type",        limit: 255, null: false
+    t.integer  "entity_id",               null: false
+    t.string   "entity_type", limit: 255, null: false
     t.text     "details"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -100,14 +100,14 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "audit_events", ["type"], name: "index_audit_events_on_type", using: :btree
 
   create_table "broadcast_messages", force: :cascade do |t|
-    t.text     "message",    null: false
+    t.text     "message",                null: false
     t.datetime "starts_at"
     t.datetime "ends_at"
     t.integer  "alert_type"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "color"
-    t.string   "font"
+    t.string   "color",      limit: 255
+    t.string   "font",       limit: 255
   end
 
   create_table "ci_application_settings", force: :cascade do |t|
@@ -119,7 +119,7 @@ ActiveRecord::Schema.define(version: 20151224123230) do
 
   create_table "ci_builds", force: :cascade do |t|
     t.integer  "project_id"
-    t.string   "status"
+    t.string   "status",             limit: 255
     t.datetime "finished_at"
     t.text     "trace"
     t.datetime "created_at"
@@ -130,19 +130,19 @@ ActiveRecord::Schema.define(version: 20151224123230) do
     t.integer  "commit_id"
     t.text     "commands"
     t.integer  "job_id"
-    t.string   "name"
-    t.boolean  "deploy",             default: false
+    t.string   "name",               limit: 255
+    t.boolean  "deploy",                         default: false
     t.text     "options"
-    t.boolean  "allow_failure",      default: false, null: false
-    t.string   "stage"
+    t.boolean  "allow_failure",                  default: false, null: false
+    t.string   "stage",              limit: 255
     t.integer  "trigger_request_id"
     t.integer  "stage_idx"
     t.boolean  "tag"
-    t.string   "ref"
+    t.string   "ref",                limit: 255
     t.integer  "user_id"
-    t.string   "type"
-    t.string   "target_url"
-    t.string   "description"
+    t.string   "type",               limit: 255
+    t.string   "target_url",         limit: 255
+    t.string   "description",        limit: 255
     t.text     "artifacts_file"
     t.integer  "gl_project_id"
   end
@@ -161,13 +161,13 @@ ActiveRecord::Schema.define(version: 20151224123230) do
 
   create_table "ci_commits", force: :cascade do |t|
     t.integer  "project_id"
-    t.string   "ref"
-    t.string   "sha"
-    t.string   "before_sha"
+    t.string   "ref",           limit: 255
+    t.string   "sha",           limit: 255
+    t.string   "before_sha",    limit: 255
     t.text     "push_data"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "tag",           default: false
+    t.boolean  "tag",                       default: false
     t.text     "yaml_errors"
     t.datetime "committed_at"
     t.integer  "gl_project_id"
@@ -194,16 +194,16 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "ci_events", ["project_id"], name: "index_ci_events_on_project_id", using: :btree
 
   create_table "ci_jobs", force: :cascade do |t|
-    t.integer  "project_id",                          null: false
+    t.integer  "project_id",                                      null: false
     t.text     "commands"
-    t.boolean  "active",         default: true,       null: false
+    t.boolean  "active",                     default: true,       null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name"
-    t.boolean  "build_branches", default: true,       null: false
-    t.boolean  "build_tags",     default: false,      null: false
-    t.string   "job_type",       default: "parallel"
-    t.string   "refs"
+    t.string   "name",           limit: 255
+    t.boolean  "build_branches",             default: true,       null: false
+    t.boolean  "build_tags",                 default: false,      null: false
+    t.string   "job_type",       limit: 255, default: "parallel"
+    t.string   "refs",           limit: 255
     t.datetime "deleted_at"
   end
 
@@ -211,25 +211,25 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "ci_jobs", ["project_id"], name: "index_ci_jobs_on_project_id", using: :btree
 
   create_table "ci_projects", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "timeout",                  default: 3600,  null: false
+    t.string   "name",                     limit: 255
+    t.integer  "timeout",                              default: 3600,  null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "token"
-    t.string   "default_ref"
-    t.string   "path"
-    t.boolean  "always_build",             default: false, null: false
+    t.string   "token",                    limit: 255
+    t.string   "default_ref",              limit: 255
+    t.string   "path",                     limit: 255
+    t.boolean  "always_build",                         default: false, null: false
     t.integer  "polling_interval"
-    t.boolean  "public",                   default: false, null: false
-    t.string   "ssh_url_to_repo"
+    t.boolean  "public",                               default: false, null: false
+    t.string   "ssh_url_to_repo",          limit: 255
     t.integer  "gitlab_id"
-    t.boolean  "allow_git_fetch",          default: true,  null: false
-    t.string   "email_recipients",         default: "",    null: false
-    t.boolean  "email_add_pusher",         default: true,  null: false
-    t.boolean  "email_only_broken_builds", default: true,  null: false
-    t.string   "skip_refs"
-    t.string   "coverage_regex"
-    t.boolean  "shared_runners_enabled",   default: false
+    t.boolean  "allow_git_fetch",                      default: true,  null: false
+    t.string   "email_recipients",         limit: 255, default: "",    null: false
+    t.boolean  "email_add_pusher",                     default: true,  null: false
+    t.boolean  "email_only_broken_builds",             default: true,  null: false
+    t.string   "skip_refs",                limit: 255
+    t.string   "coverage_regex",           limit: 255
+    t.boolean  "shared_runners_enabled",               default: false
     t.text     "generated_yaml_config"
   end
 
@@ -248,34 +248,34 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "ci_runner_projects", ["runner_id"], name: "index_ci_runner_projects_on_runner_id", using: :btree
 
   create_table "ci_runners", force: :cascade do |t|
-    t.string   "token"
+    t.string   "token",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "description"
+    t.string   "description",  limit: 255
     t.datetime "contacted_at"
-    t.boolean  "active",       default: true,  null: false
-    t.boolean  "is_shared",    default: false
-    t.string   "name"
-    t.string   "version"
-    t.string   "revision"
-    t.string   "platform"
-    t.string   "architecture"
+    t.boolean  "active",                   default: true,  null: false
+    t.boolean  "is_shared",                default: false
+    t.string   "name",         limit: 255
+    t.string   "version",      limit: 255
+    t.string   "revision",     limit: 255
+    t.string   "platform",     limit: 255
+    t.string   "architecture", limit: 255
   end
 
   create_table "ci_services", force: :cascade do |t|
-    t.string   "type"
-    t.string   "title"
-    t.integer  "project_id",                 null: false
+    t.string   "type",       limit: 255
+    t.string   "title",      limit: 255
+    t.integer  "project_id",                             null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "active",     default: false, null: false
+    t.boolean  "active",                 default: false, null: false
     t.text     "properties"
   end
 
   add_index "ci_services", ["project_id"], name: "index_ci_services_on_project_id", using: :btree
 
   create_table "ci_sessions", force: :cascade do |t|
-    t.string   "session_id", null: false
+    t.string   "session_id", limit: 255, null: false
     t.text     "data"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -287,9 +287,9 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "ci_taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
-    t.string   "taggable_type"
+    t.string   "taggable_type", limit: 255
     t.integer  "tagger_id"
-    t.string   "tagger_type"
+    t.string   "tagger_type",   limit: 255
     t.string   "context",       limit: 128
     t.datetime "created_at"
   end
@@ -298,8 +298,8 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "ci_taggings", ["taggable_id", "taggable_type", "context"], name: "index_ci_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
 
   create_table "ci_tags", force: :cascade do |t|
-    t.string  "name"
-    t.integer "taggings_count", default: 0
+    t.string  "name",           limit: 255
+    t.integer "taggings_count",             default: 0
   end
 
   add_index "ci_tags", ["name"], name: "index_ci_tags_on_name", unique: true, using: :btree
@@ -313,7 +313,7 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "ci_triggers", force: :cascade do |t|
-    t.string   "token"
+    t.string   "token",         limit: 255
     t.integer  "project_id"
     t.datetime "deleted_at"
     t.datetime "created_at"
@@ -326,19 +326,19 @@ ActiveRecord::Schema.define(version: 20151224123230) do
 
   create_table "ci_variables", force: :cascade do |t|
     t.integer "project_id"
-    t.string  "key"
+    t.string  "key",                  limit: 255
     t.text    "value"
     t.text    "encrypted_value"
-    t.string  "encrypted_value_salt"
-    t.string  "encrypted_value_iv"
+    t.string  "encrypted_value_salt", limit: 255
+    t.string  "encrypted_value_iv",   limit: 255
     t.integer "gl_project_id"
   end
 
   add_index "ci_variables", ["gl_project_id"], name: "index_ci_variables_on_gl_project_id", using: :btree
 
   create_table "ci_web_hooks", force: :cascade do |t|
-    t.string   "url",        null: false
-    t.integer  "project_id", null: false
+    t.string   "url",        limit: 255, null: false
+    t.integer  "project_id",             null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -353,8 +353,8 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
 
   create_table "emails", force: :cascade do |t|
-    t.integer  "user_id",    null: false
-    t.string   "email",      null: false
+    t.integer  "user_id",                null: false
+    t.string   "email",      limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -363,9 +363,9 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "emails", ["user_id"], name: "index_emails_on_user_id", using: :btree
 
   create_table "events", force: :cascade do |t|
-    t.string   "target_type"
+    t.string   "target_type", limit: 255
     t.integer  "target_id"
-    t.string   "title"
+    t.string   "title",       limit: 255
     t.text     "data"
     t.integer  "project_id"
     t.datetime "created_at"
@@ -391,18 +391,18 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
 
   create_table "git_hooks", force: :cascade do |t|
-    t.string   "force_push_regex"
-    t.string   "delete_branch_regex"
-    t.string   "commit_message_regex"
+    t.string   "force_push_regex",     limit: 255
+    t.string   "delete_branch_regex",  limit: 255
+    t.string   "commit_message_regex", limit: 255
     t.boolean  "deny_delete_tag"
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "author_email_regex"
-    t.boolean  "member_check",         default: false, null: false
-    t.string   "file_name_regex"
-    t.boolean  "is_sample",            default: false
-    t.integer  "max_file_size",        default: 0
+    t.string   "author_email_regex",   limit: 255
+    t.boolean  "member_check",                     default: false, null: false
+    t.string   "file_name_regex",      limit: 255
+    t.boolean  "is_sample",                        default: false
+    t.integer  "max_file_size",                    default: 0,     null: false
   end
 
   create_table "historical_data", force: :cascade do |t|
@@ -413,8 +413,8 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "identities", force: :cascade do |t|
-    t.string   "extern_uid"
-    t.string   "provider"
+    t.string   "extern_uid", limit: 255
+    t.string   "provider",   limit: 255
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -424,17 +424,17 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
 
   create_table "issues", force: :cascade do |t|
-    t.string   "title"
+    t.string   "title",         limit: 255
     t.integer  "assignee_id"
     t.integer  "author_id"
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "position",      default: 0
-    t.string   "branch_name"
+    t.integer  "position",                  default: 0
+    t.string   "branch_name",   limit: 255
     t.text     "description"
     t.integer  "milestone_id"
-    t.string   "state"
+    t.string   "state",         limit: 255
     t.integer  "iid"
     t.integer  "updated_by_id"
     t.integer  "weight"
@@ -455,10 +455,10 @@ ActiveRecord::Schema.define(version: 20151224123230) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "key"
-    t.string   "title"
-    t.string   "type"
-    t.string   "fingerprint"
-    t.boolean  "public",      default: false, null: false
+    t.string   "title",       limit: 255
+    t.string   "type",        limit: 255
+    t.string   "fingerprint", limit: 255
+    t.boolean  "public",                  default: false, null: false
   end
 
   add_index "keys", ["created_at", "id"], name: "index_keys_on_created_at_and_id", using: :btree
@@ -467,7 +467,7 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "label_links", force: :cascade do |t|
     t.integer  "label_id"
     t.integer  "target_id"
-    t.string   "target_type"
+    t.string   "target_type", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -476,31 +476,31 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "label_links", ["target_id", "target_type"], name: "index_label_links_on_target_id_and_target_type", using: :btree
 
   create_table "labels", force: :cascade do |t|
-    t.string   "title"
-    t.string   "color"
+    t.string   "title",      limit: 255
+    t.string   "color",      limit: 255
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "template",   default: false
+    t.boolean  "template",               default: false
   end
 
   add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree
 
   create_table "ldap_group_links", force: :cascade do |t|
-    t.string   "cn",           null: false
-    t.integer  "group_access", null: false
-    t.integer  "group_id",     null: false
+    t.string   "cn",           limit: 255, null: false
+    t.integer  "group_access",             null: false
+    t.integer  "group_id",                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "provider"
+    t.string   "provider",     limit: 255
   end
 
   create_table "lfs_objects", force: :cascade do |t|
-    t.string   "oid",        null: false
-    t.integer  "size",       null: false
+    t.string   "oid",        limit: 255, null: false
+    t.integer  "size",                   null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "file"
+    t.string   "file",       limit: 255
   end
 
   add_index "lfs_objects", ["oid"], name: "index_lfs_objects_on_oid", unique: true, using: :btree
@@ -521,17 +521,17 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "members", force: :cascade do |t|
-    t.integer  "access_level",       null: false
-    t.integer  "source_id",          null: false
-    t.string   "source_type",        null: false
+    t.integer  "access_level",                   null: false
+    t.integer  "source_id",                      null: false
+    t.string   "source_type",        limit: 255, null: false
     t.integer  "user_id"
-    t.integer  "notification_level", null: false
-    t.string   "type"
+    t.integer  "notification_level",             null: false
+    t.string   "type",               limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "created_by_id"
-    t.string   "invite_email"
-    t.string   "invite_token"
+    t.string   "invite_email",       limit: 255
+    t.string   "invite_token",       limit: 255
     t.datetime "invite_accepted_at"
   end
 
@@ -543,10 +543,10 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "members", ["user_id"], name: "index_members_on_user_id", using: :btree
 
   create_table "merge_request_diffs", force: :cascade do |t|
-    t.string   "state"
+    t.string   "state",            limit: 255
     t.text     "st_commits"
     t.text     "st_diffs"
-    t.integer  "merge_request_id", null: false
+    t.integer  "merge_request_id",             null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -554,26 +554,26 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree
 
   create_table "merge_requests", force: :cascade do |t|
-    t.string   "target_branch",                             null: false
-    t.string   "source_branch",                             null: false
-    t.integer  "source_project_id",                         null: false
+    t.string   "target_branch",             limit: 255,                 null: false
+    t.string   "source_branch",             limit: 255,                 null: false
+    t.integer  "source_project_id",                                     null: false
     t.integer  "author_id"
     t.integer  "assignee_id"
-    t.string   "title"
+    t.string   "title",                     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "milestone_id"
-    t.string   "state"
-    t.string   "merge_status"
-    t.integer  "target_project_id",                         null: false
+    t.string   "state",                     limit: 255
+    t.string   "merge_status",              limit: 255
+    t.integer  "target_project_id",                                     null: false
     t.integer  "iid"
     t.text     "description"
-    t.integer  "position",                  default: 0
+    t.integer  "position",                              default: 0
     t.datetime "locked_at"
     t.integer  "updated_by_id"
-    t.string   "merge_error"
+    t.string   "merge_error",               limit: 255
     t.text     "merge_params"
-    t.boolean  "merge_when_build_succeeds", default: false, null: false
+    t.boolean  "merge_when_build_succeeds",             default: false, null: false
     t.integer  "merge_user_id"
   end
 
@@ -589,13 +589,13 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
 
   create_table "milestones", force: :cascade do |t|
-    t.string   "title",       null: false
-    t.integer  "project_id",  null: false
+    t.string   "title",       limit: 255, null: false
+    t.integer  "project_id",              null: false
     t.text     "description"
     t.date     "due_date"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "state"
+    t.string   "state",       limit: 255
     t.integer  "iid"
   end
 
@@ -605,17 +605,17 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "milestones", ["project_id"], name: "index_milestones_on_project_id", using: :btree
 
   create_table "namespaces", force: :cascade do |t|
-    t.string   "name",                                  null: false
-    t.string   "path",                                  null: false
+    t.string   "name",                  limit: 255,                 null: false
+    t.string   "path",                  limit: 255,                 null: false
     t.integer  "owner_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "type"
-    t.string   "description",           default: "",    null: false
-    t.string   "avatar"
-    t.boolean  "membership_lock",       default: false
-    t.boolean  "share_with_group_lock", default: false
-    t.boolean  "public",                default: false
+    t.string   "type",                  limit: 255
+    t.string   "description",           limit: 255, default: "",    null: false
+    t.string   "avatar",                limit: 255
+    t.boolean  "membership_lock",                   default: false
+    t.boolean  "share_with_group_lock",             default: false
+    t.boolean  "public",                            default: false
   end
 
   add_index "namespaces", ["created_at", "id"], name: "index_namespaces_on_created_at_and_id", using: :btree
@@ -627,19 +627,19 @@ ActiveRecord::Schema.define(version: 20151224123230) do
 
   create_table "notes", force: :cascade do |t|
     t.text     "note"
-    t.string   "noteable_type"
+    t.string   "noteable_type", limit: 255
     t.integer  "author_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "project_id"
-    t.string   "attachment"
-    t.string   "line_code"
-    t.string   "commit_id"
+    t.string   "attachment",    limit: 255
+    t.string   "line_code",     limit: 255
+    t.string   "commit_id",     limit: 255
     t.integer  "noteable_id"
-    t.boolean  "system",        default: false, null: false
+    t.boolean  "system",                    default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
-    t.boolean  "is_award",      default: false, null: false
+    t.boolean  "is_award",                  default: false, null: false
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
@@ -655,14 +655,14 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "notes", ["updated_at"], name: "index_notes_on_updated_at", using: :btree
 
   create_table "oauth_access_grants", force: :cascade do |t|
-    t.integer  "resource_owner_id", null: false
-    t.integer  "application_id",    null: false
-    t.string   "token",             null: false
-    t.integer  "expires_in",        null: false
-    t.text     "redirect_uri",      null: false
-    t.datetime "created_at",        null: false
+    t.integer  "resource_owner_id",             null: false
+    t.integer  "application_id",                null: false
+    t.string   "token",             limit: 255, null: false
+    t.integer  "expires_in",                    null: false
+    t.text     "redirect_uri",                  null: false
+    t.datetime "created_at",                    null: false
     t.datetime "revoked_at"
-    t.string   "scopes"
+    t.string   "scopes",            limit: 255
   end
 
   add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
@@ -670,12 +670,12 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "oauth_access_tokens", force: :cascade do |t|
     t.integer  "resource_owner_id"
     t.integer  "application_id"
-    t.string   "token",             null: false
-    t.string   "refresh_token"
+    t.string   "token",             limit: 255, null: false
+    t.string   "refresh_token",     limit: 255
     t.integer  "expires_in"
     t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
-    t.string   "scopes"
+    t.datetime "created_at",                    null: false
+    t.string   "scopes",            limit: 255
   end
 
   add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
@@ -683,15 +683,15 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
 
   create_table "oauth_applications", force: :cascade do |t|
-    t.string   "name",                      null: false
-    t.string   "uid",                       null: false
-    t.string   "secret",                    null: false
-    t.text     "redirect_uri",              null: false
-    t.string   "scopes",       default: "", null: false
+    t.string   "name",         limit: 255,              null: false
+    t.string   "uid",          limit: 255,              null: false
+    t.string   "secret",       limit: 255,              null: false
+    t.text     "redirect_uri",                          null: false
+    t.string   "scopes",       limit: 255, default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "owner_id"
-    t.string   "owner_type"
+    t.string   "owner_type",   limit: 255
   end
 
   add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
@@ -711,49 +711,49 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   end
 
   create_table "projects", force: :cascade do |t|
-    t.string   "name"
-    t.string   "path"
+    t.string   "name",                             limit: 255
+    t.string   "path",                             limit: 255
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"
-    t.boolean  "issues_enabled",                   default: true,     null: false
-    t.boolean  "wall_enabled",                     default: true,     null: false
-    t.boolean  "merge_requests_enabled",           default: true,     null: false
-    t.boolean  "wiki_enabled",                     default: true,     null: false
+    t.boolean  "issues_enabled",                               default: true,     null: false
+    t.boolean  "wall_enabled",                                 default: true,     null: false
+    t.boolean  "merge_requests_enabled",                       default: true,     null: false
+    t.boolean  "wiki_enabled",                                 default: true,     null: false
     t.integer  "namespace_id"
-    t.string   "issues_tracker",                   default: "gitlab", null: false
-    t.string   "issues_tracker_id"
-    t.boolean  "snippets_enabled",                 default: true,     null: false
+    t.string   "issues_tracker",                   limit: 255, default: "gitlab", null: false
+    t.string   "issues_tracker_id",                limit: 255
+    t.boolean  "snippets_enabled",                             default: true,     null: false
     t.datetime "last_activity_at"
-    t.string   "import_url"
-    t.integer  "visibility_level",                 default: 0,        null: false
-    t.boolean  "archived",                         default: false,    null: false
-    t.string   "avatar"
-    t.string   "import_status"
-    t.float    "repository_size",                  default: 0.0
+    t.string   "import_url",                       limit: 255
+    t.integer  "visibility_level",                             default: 0,        null: false
+    t.boolean  "archived",                                     default: false,    null: false
+    t.string   "avatar",                           limit: 255
+    t.string   "import_status",                    limit: 255
+    t.float    "repository_size",                              default: 0.0
     t.text     "merge_requests_template"
-    t.integer  "star_count",                       default: 0,        null: false
-    t.boolean  "merge_requests_rebase_enabled",    default: false
-    t.string   "import_type"
-    t.string   "import_source"
-    t.integer  "approvals_before_merge",           default: 0,        null: false
-    t.boolean  "reset_approvals_on_push",          default: true
-    t.integer  "commit_count",                     default: 0
-    t.boolean  "merge_requests_ff_only_enabled",   default: false
+    t.integer  "star_count",                                   default: 0,        null: false
+    t.boolean  "merge_requests_rebase_enabled",                default: false
+    t.string   "import_type",                      limit: 255
+    t.string   "import_source",                    limit: 255
+    t.integer  "approvals_before_merge",                       default: 0,        null: false
+    t.boolean  "reset_approvals_on_push",                      default: true
+    t.integer  "commit_count",                                 default: 0
+    t.boolean  "merge_requests_ff_only_enabled",               default: false
     t.text     "issues_template"
-    t.boolean  "mirror",                           default: false,    null: false
+    t.boolean  "mirror",                                       default: false,    null: false
     t.datetime "mirror_last_update_at"
     t.datetime "mirror_last_successful_update_at"
     t.integer  "mirror_user_id"
     t.text     "import_error"
     t.integer  "ci_id"
-    t.boolean  "builds_enabled",                   default: true,     null: false
-    t.boolean  "shared_runners_enabled",           default: true,     null: false
+    t.boolean  "builds_enabled",                               default: true,     null: false
+    t.boolean  "shared_runners_enabled",                       default: true,     null: false
     t.string   "runners_token"
     t.string   "build_coverage_regex"
-    t.boolean  "build_allow_git_fetch",            default: true,     null: false
-    t.integer  "build_timeout",                    default: 3600,     null: false
+    t.boolean  "build_allow_git_fetch",                        default: true,     null: false
+    t.integer  "build_timeout",                                default: 3600,     null: false
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
@@ -769,17 +769,17 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "projects", ["visibility_level"], name: "index_projects_on_visibility_level", using: :btree
 
   create_table "protected_branches", force: :cascade do |t|
-    t.integer  "project_id",                          null: false
-    t.string   "name",                                null: false
+    t.integer  "project_id",                                      null: false
+    t.string   "name",                limit: 255,                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "developers_can_push", default: false, null: false
+    t.boolean  "developers_can_push",             default: false, null: false
   end
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
 
   create_table "releases", force: :cascade do |t|
-    t.string   "tag"
+    t.string   "tag",         limit: 255
     t.text     "description"
     t.integer  "project_id"
     t.datetime "created_at"
@@ -792,30 +792,30 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "sent_notifications", force: :cascade do |t|
     t.integer "project_id"
     t.integer "noteable_id"
-    t.string  "noteable_type"
+    t.string  "noteable_type", limit: 255
     t.integer "recipient_id"
-    t.string  "commit_id"
-    t.string  "reply_key",     null: false
-    t.string  "line_code"
+    t.string  "commit_id",     limit: 255
+    t.string  "reply_key",     limit: 255, null: false
+    t.string  "line_code",     limit: 255
   end
 
   add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree
 
   create_table "services", force: :cascade do |t|
-    t.string   "type"
-    t.string   "title"
+    t.string   "type",                  limit: 255
+    t.string   "title",                 limit: 255
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "active",                default: false, null: false
+    t.boolean  "active",                            default: false, null: false
     t.text     "properties"
-    t.boolean  "template",              default: false
-    t.boolean  "push_events",           default: true
-    t.boolean  "issues_events",         default: true
-    t.boolean  "merge_requests_events", default: true
-    t.boolean  "tag_push_events",       default: true
-    t.boolean  "note_events",           default: true,  null: false
-    t.boolean  "build_events",          default: false, null: false
+    t.boolean  "template",                          default: false
+    t.boolean  "push_events",                       default: true
+    t.boolean  "issues_events",                     default: true
+    t.boolean  "merge_requests_events",             default: true
+    t.boolean  "tag_push_events",                   default: true
+    t.boolean  "note_events",                       default: true,  null: false
+    t.boolean  "build_events",                      default: false, null: false
   end
 
   add_index "services", ["created_at", "id"], name: "index_services_on_created_at_and_id", using: :btree
@@ -823,16 +823,16 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "services", ["template"], name: "index_services_on_template", using: :btree
 
   create_table "snippets", force: :cascade do |t|
-    t.string   "title"
+    t.string   "title",            limit: 255
     t.text     "content"
-    t.integer  "author_id",                    null: false
+    t.integer  "author_id",                                null: false
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "file_name"
+    t.string   "file_name",        limit: 255
     t.datetime "expires_at"
-    t.string   "type"
-    t.integer  "visibility_level", default: 0, null: false
+    t.string   "type",             limit: 255
+    t.integer  "visibility_level",             default: 0, null: false
   end
 
   add_index "snippets", ["author_id"], name: "index_snippets_on_author_id", using: :btree
@@ -845,7 +845,7 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "subscriptions", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "subscribable_id"
-    t.string   "subscribable_type"
+    t.string   "subscribable_type", limit: 255
     t.boolean  "subscribed"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -856,10 +856,10 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
-    t.string   "taggable_type"
+    t.string   "taggable_type", limit: 255
     t.integer  "tagger_id"
-    t.string   "tagger_type"
-    t.string   "context"
+    t.string   "tagger_type",   limit: 255
+    t.string   "context",       limit: 255
     t.datetime "created_at"
   end
 
@@ -867,69 +867,69 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
 
   create_table "tags", force: :cascade do |t|
-    t.string  "name"
-    t.integer "taggings_count", default: 0
+    t.string  "name",           limit: 255
+    t.integer "taggings_count",             default: 0
   end
 
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                       default: "",    null: false
-    t.string   "encrypted_password",          default: "",    null: false
-    t.string   "reset_password_token"
+    t.string   "email",                       limit: 255, default: "",    null: false
+    t.string   "encrypted_password",          limit: 255, default: "",    null: false
+    t.string   "reset_password_token",        limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",               default: 0
+    t.integer  "sign_in_count",                           default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "name"
-    t.boolean  "admin",                       default: false, null: false
-    t.integer  "projects_limit",              default: 10
-    t.string   "skype",                       default: "",    null: false
-    t.string   "linkedin",                    default: "",    null: false
-    t.string   "twitter",                     default: "",    null: false
-    t.string   "authentication_token"
-    t.integer  "theme_id",                    default: 1,     null: false
-    t.string   "bio"
-    t.integer  "failed_attempts",             default: 0
+    t.string   "current_sign_in_ip",          limit: 255
+    t.string   "last_sign_in_ip",             limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "name",                        limit: 255
+    t.boolean  "admin",                                   default: false, null: false
+    t.integer  "projects_limit",                          default: 10
+    t.string   "skype",                       limit: 255, default: "",    null: false
+    t.string   "linkedin",                    limit: 255, default: "",    null: false
+    t.string   "twitter",                     limit: 255, default: "",    null: false
+    t.string   "authentication_token",        limit: 255
+    t.integer  "theme_id",                                default: 1,     null: false
+    t.string   "bio",                         limit: 255
+    t.integer  "failed_attempts",                         default: 0
     t.datetime "locked_at"
-    t.string   "username"
-    t.boolean  "can_create_group",            default: true,  null: false
-    t.boolean  "can_create_team",             default: true,  null: false
-    t.string   "state"
-    t.integer  "color_scheme_id",             default: 1,     null: false
-    t.integer  "notification_level",          default: 1,     null: false
+    t.string   "username",                    limit: 255
+    t.boolean  "can_create_group",                        default: true,  null: false
+    t.boolean  "can_create_team",                         default: true,  null: false
+    t.string   "state",                       limit: 255
+    t.integer  "color_scheme_id",                         default: 1,     null: false
+    t.integer  "notification_level",                      default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
     t.datetime "last_credential_check_at"
-    t.string   "avatar"
-    t.string   "confirmation_token"
+    t.string   "avatar",                      limit: 255
+    t.string   "confirmation_token",          limit: 255
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.boolean  "hide_no_ssh_key",             default: false
-    t.string   "website_url",                 default: "",    null: false
+    t.string   "unconfirmed_email",           limit: 255
+    t.boolean  "hide_no_ssh_key",                         default: false
+    t.string   "website_url",                 limit: 255, default: "",    null: false
     t.datetime "admin_email_unsubscribed_at"
-    t.string   "notification_email"
-    t.boolean  "hide_no_password",            default: false
-    t.boolean  "password_automatically_set",  default: false
-    t.string   "location"
-    t.string   "encrypted_otp_secret"
-    t.string   "encrypted_otp_secret_iv"
-    t.string   "encrypted_otp_secret_salt"
-    t.boolean  "otp_required_for_login",      default: false, null: false
+    t.string   "notification_email",          limit: 255
+    t.boolean  "hide_no_password",                        default: false
+    t.boolean  "password_automatically_set",              default: false
+    t.string   "location",                    limit: 255
+    t.string   "encrypted_otp_secret",        limit: 255
+    t.string   "encrypted_otp_secret_iv",     limit: 255
+    t.string   "encrypted_otp_secret_salt",   limit: 255
+    t.boolean  "otp_required_for_login",                  default: false, null: false
     t.text     "otp_backup_codes"
-    t.string   "public_email",                default: "",    null: false
-    t.integer  "dashboard",                   default: 0
-    t.integer  "project_view",                default: 0
+    t.string   "public_email",                limit: 255, default: "",    null: false
+    t.integer  "dashboard",                               default: 0
+    t.integer  "project_view",                            default: 0
     t.integer  "consumed_timestep"
-    t.integer  "layout",                      default: 0
-    t.boolean  "hide_project_limit",          default: false
+    t.integer  "layout",                                  default: 0
     t.text     "note"
+    t.boolean  "hide_project_limit",                      default: false
     t.string   "unlock_token"
     t.datetime "otp_grace_period_started_at"
   end
@@ -956,20 +956,20 @@ ActiveRecord::Schema.define(version: 20151224123230) do
   add_index "users_star_projects", ["user_id"], name: "index_users_star_projects_on_user_id", using: :btree
 
   create_table "web_hooks", force: :cascade do |t|
-    t.string   "url"
+    t.string   "url",                     limit: 255
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "type",                    default: "ProjectHook"
+    t.string   "type",                    limit: 255, default: "ProjectHook"
     t.integer  "service_id"
-    t.boolean  "push_events",             default: true,          null: false
-    t.boolean  "issues_events",           default: false,         null: false
-    t.boolean  "merge_requests_events",   default: false,         null: false
-    t.boolean  "tag_push_events",         default: false
+    t.boolean  "push_events",                         default: true,          null: false
+    t.boolean  "issues_events",                       default: false,         null: false
+    t.boolean  "merge_requests_events",               default: false,         null: false
+    t.boolean  "tag_push_events",                     default: false
     t.integer  "group_id"
-    t.boolean  "note_events",             default: false,         null: false
-    t.boolean  "enable_ssl_verification", default: true
-    t.boolean  "build_events",            default: false,         null: false
+    t.boolean  "note_events",                         default: false,         null: false
+    t.boolean  "enable_ssl_verification",             default: true
+    t.boolean  "build_events",                        default: false,         null: false
   end
 
   add_index "web_hooks", ["created_at", "id"], name: "index_web_hooks_on_created_at_and_id", using: :btree
diff --git a/spec/models/git_hook_spec.rb b/spec/models/git_hook_spec.rb
index 8c14de15ba6..74d97135600 100644
--- a/spec/models/git_hook_spec.rb
+++ b/spec/models/git_hook_spec.rb
@@ -7,5 +7,6 @@ describe GitHook do
 
   describe "Validation" do
     it { should validate_presence_of(:project) }
+    it { should validate_numericality_of(:max_file_size).is_greater_than_or_equal_to(0).only_integer }
   end
 end