From a66d9b4c768d9ed2e0096645fb2b4f61c222283d Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Sun, 18 Dec 2011 16:09:16 +0200 Subject: [PATCH] annotate model --- app/models/issue.rb | 1 + app/models/merge_request.rb | 16 ++++++++++++++++ app/models/project.rb | 19 ++++++++++--------- app/models/users_project.rb | 15 +++++++-------- spec/models/issue_spec.rb | 1 + spec/models/merge_request_spec.rb | 16 ++++++++++++++++ spec/models/project_spec.rb | 19 ++++++++++--------- spec/models/users_project_spec.rb | 15 +++++++-------- 8 files changed, 68 insertions(+), 34 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index b8b4326..a77ca3d 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -59,5 +59,6 @@ end # closed :boolean default(FALSE), not null # position :integer default(0) # critical :boolean default(FALSE), not null +# branch_name :string(255) # diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6f8b0cd..5827bd6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -44,3 +44,19 @@ class MergeRequest < ActiveRecord::Base project.commit(source_branch) end end +# == Schema Information +# +# Table name: merge_requests +# +# id :integer not null, primary key +# target_branch :string(255) not null +# source_branch :string(255) not null +# project_id :integer not null +# author_id :integer +# assignee_id :integer +# title :string(255) +# closed :boolean default(FALSE), not null +# created_at :datetime +# updated_at :datetime +# + diff --git a/app/models/project.rb b/app/models/project.rb index 56d55fa..d7c9515 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -247,14 +247,15 @@ end # # Table name: projects # -# id :integer not null, primary key -# name :string(255) -# path :string(255) -# description :text -# created_at :datetime -# updated_at :datetime -# private_flag :boolean default(TRUE), not null -# code :string(255) -# owner_id :integer +# id :integer not null, primary key +# name :string(255) +# path :string(255) +# description :text +# created_at :datetime +# updated_at :datetime +# private_flag :boolean default(TRUE), not null +# code :string(255) +# owner_id :integer +# default_branch :string(255) default("master"), not null # diff --git a/app/models/users_project.rb b/app/models/users_project.rb index 84d84cf..6fd067c 100644 --- a/app/models/users_project.rb +++ b/app/models/users_project.rb @@ -23,13 +23,12 @@ end # # Table name: users_projects # -# id :integer not null, primary key -# user_id :integer not null -# project_id :integer not null -# read :boolean default(FALSE) -# write :boolean default(FALSE) -# admin :boolean default(FALSE) -# created_at :datetime -# updated_at :datetime +# id :integer not null, primary key +# user_id :integer not null +# project_id :integer not null +# created_at :datetime +# updated_at :datetime +# repo_access :integer default(0), not null +# project_access :integer default(0), not null # diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index ac67863..74eb5b9 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -39,5 +39,6 @@ end # closed :boolean default(FALSE), not null # position :integer default(0) # critical :boolean default(FALSE), not null +# branch_name :string(255) # diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index e686877..f6b4cbc 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -26,3 +26,19 @@ describe MergeRequest do :assignee => Factory(:user), :project => Factory.create(:project)).should be_valid } end +# == Schema Information +# +# Table name: merge_requests +# +# id :integer not null, primary key +# target_branch :string(255) not null +# source_branch :string(255) not null +# project_id :integer not null +# author_id :integer +# assignee_id :integer +# title :string(255) +# closed :boolean default(FALSE), not null +# created_at :datetime +# updated_at :datetime +# + diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index eda20a0..a5edc40 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -168,14 +168,15 @@ end # # Table name: projects # -# id :integer not null, primary key -# name :string(255) -# path :string(255) -# description :text -# created_at :datetime -# updated_at :datetime -# private_flag :boolean default(TRUE), not null -# code :string(255) -# owner_id :integer +# id :integer not null, primary key +# name :string(255) +# path :string(255) +# description :text +# created_at :datetime +# updated_at :datetime +# private_flag :boolean default(TRUE), not null +# code :string(255) +# owner_id :integer +# default_branch :string(255) default("master"), not null # diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb index c153916..41e36b5 100644 --- a/spec/models/users_project_spec.rb +++ b/spec/models/users_project_spec.rb @@ -20,13 +20,12 @@ end # # Table name: users_projects # -# id :integer not null, primary key -# user_id :integer not null -# project_id :integer not null -# read :boolean default(FALSE) -# write :boolean default(FALSE) -# admin :boolean default(FALSE) -# created_at :datetime -# updated_at :datetime +# id :integer not null, primary key +# user_id :integer not null +# project_id :integer not null +# created_at :datetime +# updated_at :datetime +# repo_access :integer default(0), not null +# project_access :integer default(0), not null # -- libgit2 0.21.2