From 93fdc4ca9d073ad73beacfd673ddc4e5652111ab Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 20 Nov 2012 14:19:55 +0200 Subject: [PATCH] Reannotated --- app/models/gitlab_ci_service.rb | 16 +++++++++------- app/models/project_hook.rb | 1 + app/models/service.rb | 16 +++++++++------- app/models/service_hook.rb | 1 + app/models/system_hook.rb | 1 + app/models/web_hook.rb | 1 + spec/models/service_hook_spec.rb | 1 + spec/models/service_spec.rb | 16 +++++++++------- spec/models/system_hook_spec.rb | 1 + spec/models/web_hook_spec.rb | 1 + 10 files changed, 34 insertions(+), 21 deletions(-) diff --git a/app/models/gitlab_ci_service.rb b/app/models/gitlab_ci_service.rb index 020dc868841a..0bce425fdab7 100644 --- a/app/models/gitlab_ci_service.rb +++ b/app/models/gitlab_ci_service.rb @@ -2,13 +2,15 @@ # # Table name: services # -# id :integer not null, primary key -# type :string(255) -# title :string(255) -# token :string(255) -# project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# token :string(255) +# project_id :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# active :boolean default(FALSE), not null +# project_url :string(255) # class GitlabCiService < Service diff --git a/app/models/project_hook.rb b/app/models/project_hook.rb index aebf2054f8e7..2576fc979d4b 100644 --- a/app/models/project_hook.rb +++ b/app/models/project_hook.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # class ProjectHook < WebHook diff --git a/app/models/service.rb b/app/models/service.rb index 70e29701240f..17a7a656de59 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -2,13 +2,15 @@ # # Table name: services # -# id :integer not null, primary key -# type :string(255) -# title :string(255) -# token :string(255) -# project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# token :string(255) +# project_id :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# active :boolean default(FALSE), not null +# project_url :string(255) # class Service < ActiveRecord::Base diff --git a/app/models/service_hook.rb b/app/models/service_hook.rb index aedd0eef271e..4cd2b272eece 100644 --- a/app/models/service_hook.rb +++ b/app/models/service_hook.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # class ServiceHook < WebHook diff --git a/app/models/system_hook.rb b/app/models/system_hook.rb index 3bc9089fdc85..2ae5b1314e9e 100644 --- a/app/models/system_hook.rb +++ b/app/models/system_hook.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # class SystemHook < WebHook diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb index ac3e10cf96f2..df58fa93b7e4 100644 --- a/app/models/web_hook.rb +++ b/app/models/web_hook.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # class WebHook < ActiveRecord::Base diff --git a/spec/models/service_hook_spec.rb b/spec/models/service_hook_spec.rb index 25fc409646df..0b0262c97f18 100644 --- a/spec/models/service_hook_spec.rb +++ b/spec/models/service_hook_spec.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # require "spec_helper" diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 0329b9a94e36..1a58f680baf5 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -2,13 +2,15 @@ # # Table name: services # -# id :integer not null, primary key -# type :string(255) -# title :string(255) -# token :string(255) -# project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# token :string(255) +# project_id :integer not null +# created_at :datetime not null +# updated_at :datetime not null +# active :boolean default(FALSE), not null +# project_url :string(255) # require 'spec_helper' diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb index a99e91d34d00..9d03b56cd8f5 100644 --- a/spec/models/system_hook_spec.rb +++ b/spec/models/system_hook_spec.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # require "spec_helper" diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb index aa040b5064fa..2d9301732dd9 100644 --- a/spec/models/web_hook_spec.rb +++ b/spec/models/web_hook_spec.rb @@ -8,6 +8,7 @@ # created_at :datetime not null # updated_at :datetime not null # type :string(255) default("ProjectHook") +# service_id :integer # require 'spec_helper'