diff options
| -rw-r--r-- | app/models/gitlab_ci_service.rb | 16 | ||||
| -rw-r--r-- | app/models/project_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/service.rb | 16 | ||||
| -rw-r--r-- | app/models/service_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/system_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/web_hook.rb | 1 | ||||
| -rw-r--r-- | spec/models/service_hook_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/service_spec.rb | 16 | ||||
| -rw-r--r-- | spec/models/system_hook_spec.rb | 1 | ||||
| -rw-r--r-- | 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 020dc868841..0bce425fdab 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 aebf2054f8e..2576fc979d4 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 70e29701240..17a7a656de5 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 aedd0eef271..4cd2b272eec 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 3bc9089fdc8..2ae5b1314e9 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 ac3e10cf96f..df58fa93b7e 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 25fc409646d..0b0262c97f1 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 0329b9a94e3..1a58f680baf 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 a99e91d34d0..9d03b56cd8f 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 aa040b5064f..2d9301732dd 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' |