diff --git a/app/models/issue.rb b/app/models/issue.rb index b8b432673a4996b616c47bbdbbb1c3d4b9f24b6c..a77ca3dab75efc21e96bcb97770e0562479cd466 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 6f8b0cdfedd43bf417904741d42210c408569b78..5827bd68f8f230e2f361c6131ef692751d49ab45 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 56d55fa2bc89f72d749d9ffdf3cc9d3744cbd5d2..d7c9515ec35b3fbffa16f6220e5c9ba1e939f9b8 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 84d84cf389966cbc7bb42158a1446073e129d68c..6fd067c36c236ef4326ea351fb58df8dda63c953 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 ac6786333d1379b816737c4120e6f3c1ed75dd3a..74eb5b93f2158323d80f8d68c277b74bc02fed1b 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 e6868779f428eff715dc3ca4fd91a94ca9af2bcc..f6b4cbc84166cc18604898cdf1ebcf7cf4aa41ad 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 eda20a0c011b442eb02d99ff50cb3661ec019b36..a5edc408a1f18c4f215c86362de1742b135a32d3 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 c15391619c64ff77af96e8b14ddc50953585c8af..41e36b57204998f6ba0695eecdb9dd35ac87f4c9 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 #