diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-18 00:36:31 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-18 00:36:31 +0000 |
| commit | 513b45686e012537dcfd273d9744767257580eee (patch) | |
| tree | 1536dc28dfcf18d3d6d9b0ed9a4ad82a71e9171b | |
| parent | 80be924546888f0b64a96fcbe177252bade0c996 (diff) | |
| parent | e80113593c120b71af428ea1b00f11fcdeae58b8 (diff) | |
| download | gitlab-ce-513b45686e012537dcfd273d9744767257580eee.tar.gz | |
Merge branch 'hook_url_limit' into 'master'
Raise hook url limit
1. Up varchar url limit to 2000 chars instead 255
2. Maybe migration?
3. 255 characters - it is not enough
4. nil
5. nil
See merge request !1940
| -rw-r--r-- | app/models/hooks/project_hook.rb | 4 | ||||
| -rw-r--r-- | app/models/hooks/service_hook.rb | 4 | ||||
| -rw-r--r-- | app/models/hooks/system_hook.rb | 4 | ||||
| -rw-r--r-- | app/models/hooks/web_hook.rb | 4 | ||||
| -rw-r--r-- | db/migrate/20151201203948_raise_hook_url_limit.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 18 |
6 files changed, 22 insertions, 17 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index fa18ba5dbbe..fe923fafbe0 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -3,11 +3,11 @@ # Table name: web_hooks # # id :integer not null, primary key -# url :string(255) +# url :string(2000) # project_id :integer # created_at :datetime # updated_at :datetime -# type :string(255) default("ProjectHook") +# type :string default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb index b333a337347..80962264ba2 100644 --- a/app/models/hooks/service_hook.rb +++ b/app/models/hooks/service_hook.rb @@ -3,11 +3,11 @@ # Table name: web_hooks # # id :integer not null, primary key -# url :string(255) +# url :string(2000) # project_id :integer # created_at :datetime # updated_at :datetime -# type :string(255) default("ProjectHook") +# type :string default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index d81512fae5d..c147d8762a9 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -3,11 +3,11 @@ # Table name: web_hooks # # id :integer not null, primary key -# url :string(255) +# url :string(2000) # project_id :integer # created_at :datetime # updated_at :datetime -# type :string(255) default("ProjectHook") +# type :string default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 3bb50c63cac..7a13c3f0a39 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -3,11 +3,11 @@ # Table name: web_hooks # # id :integer not null, primary key -# url :string(255) +# url :string(2000) # project_id :integer # created_at :datetime # updated_at :datetime -# type :string(255) default("ProjectHook") +# type :string default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null diff --git a/db/migrate/20151201203948_raise_hook_url_limit.rb b/db/migrate/20151201203948_raise_hook_url_limit.rb new file mode 100644 index 00000000000..98a7fca6f6f --- /dev/null +++ b/db/migrate/20151201203948_raise_hook_url_limit.rb @@ -0,0 +1,5 @@ +class RaiseHookUrlLimit < ActiveRecord::Migration + def change + change_column :web_hooks, :url, :string, limit: 2000 + end +end diff --git a/db/schema.rb b/db/schema.rb index 2fc8c4d5ed4..9045135dd9a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -874,19 +874,19 @@ ActiveRecord::Schema.define(version: 20160113111034) 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: 2000 t.integer "project_id" t.datetime "created_at" t.datetime "updated_at" - t.string "type", default: "ProjectHook" + t.string "type", 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 "note_events", default: false, null: false - t.boolean "enable_ssl_verification", default: true - t.boolean "build_events", default: false, null: 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.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 |