Download as
Browse Code »

Commit 93fdc4ca9d073ad73beacfd673ddc4e5652111ab

Authored by Dmitriy Zaporozhets
1 parent 9f65c274
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Reannotated

Showing 10 changed files with 34 additions and 21 deletions   Show diff stats
app/models/gitlab_ci_service.rb
  Diff comments   View file @93fdc4c
@@ -2,13 +2,15 @@ @@ -2,13 +2,15 @@
2 # 2 #
3 # Table name: services 3 # Table name: services
4 # 4 #
5 -# id :integer not null, primary key  
6 -# type :string(255)  
7 -# title :string(255)  
8 -# token :string(255)  
9 -# project_id :integer not null  
10 -# created_at :datetime not null  
11 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# type :string(255)
  7 +# title :string(255)
  8 +# token :string(255)
  9 +# project_id :integer not null
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +# active :boolean default(FALSE), not null
  13 +# project_url :string(255)
12 # 14 #
13 15
14 class GitlabCiService < Service 16 class GitlabCiService < Service
app/models/project_hook.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 class ProjectHook < WebHook 14 class ProjectHook < WebHook
app/models/service.rb
  Diff comments   View file @93fdc4c
@@ -2,13 +2,15 @@ @@ -2,13 +2,15 @@
2 # 2 #
3 # Table name: services 3 # Table name: services
4 # 4 #
5 -# id :integer not null, primary key  
6 -# type :string(255)  
7 -# title :string(255)  
8 -# token :string(255)  
9 -# project_id :integer not null  
10 -# created_at :datetime not null  
11 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# type :string(255)
  7 +# title :string(255)
  8 +# token :string(255)
  9 +# project_id :integer not null
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +# active :boolean default(FALSE), not null
  13 +# project_url :string(255)
12 # 14 #
13 15
14 class Service < ActiveRecord::Base 16 class Service < ActiveRecord::Base
app/models/service_hook.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 class ServiceHook < WebHook 14 class ServiceHook < WebHook
app/models/system_hook.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 class SystemHook < WebHook 14 class SystemHook < WebHook
app/models/web_hook.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 class WebHook < ActiveRecord::Base 14 class WebHook < ActiveRecord::Base
spec/models/service_hook_spec.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 require "spec_helper" 14 require "spec_helper"
spec/models/service_spec.rb
  Diff comments   View file @93fdc4c
@@ -2,13 +2,15 @@ @@ -2,13 +2,15 @@
2 # 2 #
3 # Table name: services 3 # Table name: services
4 # 4 #
5 -# id :integer not null, primary key  
6 -# type :string(255)  
7 -# title :string(255)  
8 -# token :string(255)  
9 -# project_id :integer not null  
10 -# created_at :datetime not null  
11 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# type :string(255)
  7 +# title :string(255)
  8 +# token :string(255)
  9 +# project_id :integer not null
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +# active :boolean default(FALSE), not null
  13 +# project_url :string(255)
12 # 14 #
13 15
14 require 'spec_helper' 16 require 'spec_helper'
spec/models/system_hook_spec.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 require "spec_helper" 14 require "spec_helper"
spec/models/web_hook_spec.rb
  Diff comments   View file @93fdc4c
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 # created_at :datetime not null 8 # created_at :datetime not null
9 # updated_at :datetime not null 9 # updated_at :datetime not null
10 # type :string(255) default("ProjectHook") 10 # type :string(255) default("ProjectHook")
  11 +# service_id :integer
11 # 12 #
12 13
13 require 'spec_helper' 14 require 'spec_helper'