summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 10:16:28 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 10:16:28 -0700
commitbdec2aae888628864f45bcc70ae7c9831bb32d22 (patch)
tree05624b47bb9c5937e84c49c7a0a1363a44fa5c41
parent19b69ce69c7aad00a9fbb00672002ff750e8d99a (diff)
downloadgitlab-ci-bdec2aae888628864f45bcc70ae7c9831bb32d22.tar.gz
Annotate models
-rw-r--r--app/models/job.rb2
-rw-r--r--app/models/project.rb1
-rw-r--r--app/models/runner.rb4
-rw-r--r--spec/factories/projects.rb3
-rw-r--r--spec/factories/runners.rb13
-rw-r--r--spec/models/job_spec.rb17
-rw-r--r--spec/models/mail_service_spec.rb14
-rw-r--r--spec/models/project_spec.rb1
-rw-r--r--spec/models/runner_spec.rb13
9 files changed, 56 insertions, 12 deletions
diff --git a/app/models/job.rb b/app/models/job.rb
index 6453def..106e0d3 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -11,6 +11,8 @@
# name :string(255)
# build_branches :boolean default(TRUE), not null
# build_tags :boolean default(FALSE), not null
+# job_type :string(255) default("parallel")
+# refs :string(255)
#
class Job < ActiveRecord::Base
diff --git a/app/models/project.rb b/app/models/project.rb
index b47124d..cb1258e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -21,6 +21,7 @@
# email_only_broken_builds :boolean default(TRUE), not null
# skip_refs :string(255)
# coverage_regex :string(255)
+# shared_runners_enabled :boolean default(FALSE)
#
class Project < ActiveRecord::Base
diff --git a/app/models/runner.rb b/app/models/runner.rb
index 7b32cea..91a672a 100644
--- a/app/models/runner.rb
+++ b/app/models/runner.rb
@@ -6,8 +6,10 @@
# token :string(255)
# created_at :datetime
# updated_at :datetime
-# contacted_at :datetime
# description :string(255)
+# contacted_at :datetime
+# active :boolean default(TRUE), not null
+# is_shared :boolean default(FALSE)
#
class Runner < ActiveRecord::Base
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index a123f8f..e28d53e 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -17,10 +17,11 @@
# gitlab_id :integer
# allow_git_fetch :boolean default(TRUE), not null
# email_recipients :string(255) default(""), not null
-# email_add_pusher :boolean default(TRUE), not null
+# email_add_pusher :boolean default(TRUE), not null
# email_only_broken_builds :boolean default(TRUE), not null
# skip_refs :string(255)
# coverage_regex :string(255)
+# shared_runners_enabled :boolean default(FALSE)
#
# Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/factories/runners.rb b/spec/factories/runners.rb
index f85f23d..5fe32a6 100644
--- a/spec/factories/runners.rb
+++ b/spec/factories/runners.rb
@@ -2,11 +2,14 @@
#
# Table name: runners
#
-# id :integer not null, primary key
-# token :string(255)
-# created_at :datetime
-# updated_at :datetime
-# description :string(255)
+# id :integer not null, primary key
+# token :string(255)
+# created_at :datetime
+# updated_at :datetime
+# description :string(255)
+# contacted_at :datetime
+# active :boolean default(TRUE), not null
+# is_shared :boolean default(FALSE)
#
# Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/models/job_spec.rb b/spec/models/job_spec.rb
index 342eab7..f80519d 100644
--- a/spec/models/job_spec.rb
+++ b/spec/models/job_spec.rb
@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: jobs
+#
+# id :integer not null, primary key
+# project_id :integer not null
+# commands :text
+# active :boolean default(TRUE), not null
+# created_at :datetime
+# updated_at :datetime
+# name :string(255)
+# build_branches :boolean default(TRUE), not null
+# build_tags :boolean default(FALSE), not null
+# job_type :string(255) default("parallel")
+# refs :string(255)
+#
+
require 'spec_helper'
describe Job do
diff --git a/spec/models/mail_service_spec.rb b/spec/models/mail_service_spec.rb
index a24fca2..97f29f0 100644
--- a/spec/models/mail_service_spec.rb
+++ b/spec/models/mail_service_spec.rb
@@ -1,3 +1,17 @@
+# == Schema Information
+#
+# Table name: services
+#
+# id :integer not null, primary key
+# type :string(255)
+# title :string(255)
+# project_id :integer not null
+# created_at :datetime
+# updated_at :datetime
+# active :boolean default(FALSE), not null
+# properties :text
+#
+
require 'spec_helper'
describe MailService do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6fc6c32..28ccca7 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -21,6 +21,7 @@
# email_only_broken_builds :boolean default(TRUE), not null
# skip_refs :string(255)
# coverage_regex :string(255)
+# shared_runners_enabled :boolean default(FALSE)
#
require 'spec_helper'
diff --git a/spec/models/runner_spec.rb b/spec/models/runner_spec.rb
index db2fac3..128a05c 100644
--- a/spec/models/runner_spec.rb
+++ b/spec/models/runner_spec.rb
@@ -2,11 +2,14 @@
#
# Table name: runners
#
-# id :integer not null, primary key
-# token :string(255)
-# created_at :datetime
-# updated_at :datetime
-# description :string(255)
+# id :integer not null, primary key
+# token :string(255)
+# created_at :datetime
+# updated_at :datetime
+# description :string(255)
+# contacted_at :datetime
+# active :boolean default(TRUE), not null
+# is_shared :boolean default(FALSE)
#
require 'spec_helper'