Merge branch 'annotations' into 'master'

Update annotations

I don't think that we need entry in log for this change.

/cc @vsizov

See merge request !189

15 files changed, 87 insertions, 30 deletions

diff --git a/app/models/build.rb b/app/models/build.rb
index 62540ca..725da75 100644
--- a/app/models/build.rb
+++ b/app/models/build.rb
@@ -15,6 +15,9 @@
 #  coverage    :float
 #  commands    :text
 #  options     :text
+#  job_id      :integer
+#  name        :string(255)
+#  deploy      :boolean          default(FALSE)
 #
 
 class Build < ActiveRecord::Base
diff --git a/app/models/commit.rb b/app/models/commit.rb
index dae2658..d9774d3 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -2,14 +2,16 @@
 #
 # Table name: commits
 #
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  ref        :string(255)
-#  sha        :string(255)
-#  before_sha :string(255)
-#  push_data  :text
-#  created_at :datetime
-#  updated_at :datetime
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  ref         :string(255)
+#  sha         :string(255)
+#  before_sha  :string(255)
+#  push_data   :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#  tag         :boolean          default(FALSE)
+#  yaml_errors :text
 #
 
 class Commit < ActiveRecord::Base
diff --git a/app/models/project.rb b/app/models/project.rb
index 4ec9495..4e3e966 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -4,7 +4,7 @@
 #
 #  id                       :integer          not null, primary key
 #  name                     :string(255)      not null
-#  timeout                  :integer          default(1800), not null
+#  timeout                  :integer          default(3600), not null
 #  created_at               :datetime
 #  updated_at               :datetime
 #  token                    :string(255)
@@ -22,6 +22,7 @@
 #  skip_refs                :string(255)
 #  coverage_regex           :string(255)
 #  shared_runners_enabled   :boolean          default(FALSE)
+#  generated_yaml_config    :text
 #
 
 class Project < ActiveRecord::Base
diff --git a/app/models/runner.rb b/app/models/runner.rb
index 3747218..a0a198c 100644
--- a/app/models/runner.rb
+++ b/app/models/runner.rb
@@ -10,6 +10,11 @@
 #  contacted_at :datetime
 #  active       :boolean          default(TRUE), not null
 #  is_shared    :boolean          default(FALSE)
+#  name         :string(255)
+#  version      :string(255)
+#  revision     :string(255)
+#  platform     :string(255)
+#  architecture :string(255)
 #
 
 class Runner < ActiveRecord::Base
diff --git a/app/models/variable.rb b/app/models/variable.rb
index a53a27f..ebd3a44 100644
--- a/app/models/variable.rb
+++ b/app/models/variable.rb
@@ -1,3 +1,13 @@
+# == Schema Information
+#
+# Table name: variables
+#
+#  id         :integer          not null, primary key
+#  project_id :integer          not null
+#  key        :string(255)
+#  value      :text
+#
+
 class Variable < ActiveRecord::Base
   belongs_to :project
 end
diff --git a/db/schema.rb b/db/schema.rb
index 1525d74..c5e59b2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -176,7 +176,7 @@ ActiveRecord::Schema.define(version: 20150706103229) do
   add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
 
   create_table "variables", force: true do |t|
-    t.integer "project_id",           null: false
+    t.integer "project_id", null: false
     t.string  "key"
     t.text    "value"
   end
diff --git a/spec/factories/builds.rb b/spec/factories/builds.rb
index 92f9f05..bddf6eb 100644
--- a/spec/factories/builds.rb
+++ b/spec/factories/builds.rb
@@ -15,6 +15,9 @@
 #  coverage    :float
 #  commands    :text
 #  options     :text
+#  job_id      :integer
+#  name        :string(255)
+#  deploy      :boolean          default(FALSE)
 #
 
 # Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/factories/commits.rb b/spec/factories/commits.rb
index 4779f37..1f4a383 100644
--- a/spec/factories/commits.rb
+++ b/spec/factories/commits.rb
@@ -2,14 +2,16 @@
 #
 # Table name: commits
 #
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  ref        :string(255)
-#  sha        :string(255)
-#  before_sha :string(255)
-#  push_data  :text
-#  created_at :datetime
-#  updated_at :datetime
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  ref         :string(255)
+#  sha         :string(255)
+#  before_sha  :string(255)
+#  push_data   :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#  tag         :boolean          default(FALSE)
+#  yaml_errors :text
 #
 
 # Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index f6cef2d..fb5b563 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -4,12 +4,12 @@
 #
 #  id                       :integer          not null, primary key
 #  name                     :string(255)      not null
-#  timeout                  :integer          default(1800), not null
+#  timeout                  :integer          default(3600), not null
 #  created_at               :datetime
 #  updated_at               :datetime
 #  token                    :string(255)
 #  default_ref              :string(255)
-#  path               :string(255)
+#  path                     :string(255)
 #  always_build             :boolean          default(FALSE), not null
 #  polling_interval         :integer
 #  public                   :boolean          default(FALSE), not null
@@ -22,6 +22,7 @@
 #  skip_refs                :string(255)
 #  coverage_regex           :string(255)
 #  shared_runners_enabled   :boolean          default(FALSE)
+#  generated_yaml_config    :text
 #
 
 # Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/factories/runners.rb b/spec/factories/runners.rb
index 72d3e3d..20a80f0 100644
--- a/spec/factories/runners.rb
+++ b/spec/factories/runners.rb
@@ -10,6 +10,11 @@
 #  contacted_at :datetime
 #  active       :boolean          default(TRUE), not null
 #  is_shared    :boolean          default(FALSE)
+#  name         :string(255)
+#  version      :string(255)
+#  revision     :string(255)
+#  platform     :string(255)
+#  architecture :string(255)
 #
 
 # Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index b7e9672..8bc9807 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -15,6 +15,9 @@
 #  coverage    :float
 #  commands    :text
 #  options     :text
+#  job_id      :integer
+#  name        :string(255)
+#  deploy      :boolean          default(FALSE)
 #
 
 require 'spec_helper'
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 76d3178..14d6d99 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -2,14 +2,16 @@
 #
 # Table name: commits
 #
-#  id         :integer          not null, primary key
-#  project_id :integer
-#  ref        :string(255)
-#  sha        :string(255)
-#  before_sha :string(255)
-#  push_data  :text
-#  created_at :datetime
-#  updated_at :datetime
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  ref         :string(255)
+#  sha         :string(255)
+#  before_sha  :string(255)
+#  push_data   :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#  tag         :boolean          default(FALSE)
+#  yaml_errors :text
 #
 
 require 'spec_helper'
diff --git a/spec/models/project_services/hip_chat_service_spec.rb b/spec/models/project_services/hip_chat_service_spec.rb
index 5642221..37ce490 100644
--- a/spec/models/project_services/hip_chat_service_spec.rb
+++ b/spec/models/project_services/hip_chat_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'
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c27f05a..c15fa2b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -4,12 +4,12 @@
 #
 #  id                       :integer          not null, primary key
 #  name                     :string(255)      not null
-#  timeout                  :integer          default(1800), not null
+#  timeout                  :integer          default(3600), not null
 #  created_at               :datetime
 #  updated_at               :datetime
 #  token                    :string(255)
 #  default_ref              :string(255)
-#  path                    :string(255)
+#  path                     :string(255)
 #  always_build             :boolean          default(FALSE), not null
 #  polling_interval         :integer
 #  public                   :boolean          default(FALSE), not null
@@ -22,6 +22,7 @@
 #  skip_refs                :string(255)
 #  coverage_regex           :string(255)
 #  shared_runners_enabled   :boolean          default(FALSE)
+#  generated_yaml_config    :text
 #
 
 require 'spec_helper'
diff --git a/spec/models/runner_spec.rb b/spec/models/runner_spec.rb
index 6b90367..6902c0a 100644
--- a/spec/models/runner_spec.rb
+++ b/spec/models/runner_spec.rb
@@ -10,6 +10,11 @@
 #  contacted_at :datetime
 #  active       :boolean          default(TRUE), not null
 #  is_shared    :boolean          default(FALSE)
+#  name         :string(255)
+#  version      :string(255)
+#  revision     :string(255)
+#  platform     :string(255)
+#  architecture :string(255)
 #
 
 require 'spec_helper'