diff options
| -rw-r--r-- | app/models/issue.rb | 1 | ||||
| -rw-r--r-- | app/models/label.rb | 12 | ||||
| -rw-r--r-- | app/models/label_link.rb | 12 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 3 | ||||
| -rw-r--r-- | app/models/project_services/ci_service.rb | 19 | ||||
| -rw-r--r-- | app/models/users_star_project.rb | 10 | ||||
| -rw-r--r-- | spec/factories/label_links.rb | 12 | ||||
| -rw-r--r-- | spec/factories/labels.rb | 12 | ||||
| -rw-r--r-- | spec/factories/merge_requests.rb | 22 | ||||
| -rw-r--r-- | spec/factories/notes.rb | 19 | ||||
| -rw-r--r-- | spec/factories/projects.rb | 28 | ||||
| -rw-r--r-- | spec/models/label_link_spec.rb | 12 | ||||
| -rw-r--r-- | spec/models/label_spec.rb | 12 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 2 |
17 files changed, 172 insertions, 8 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 92a8ff9b677..45a8e43b03d 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -15,7 +15,6 @@ # milestone_id :integer # state :string(255) # iid :integer -# attachment :string(255) # require 'carrierwave/orm/activerecord' diff --git a/app/models/label.rb b/app/models/label.rb index 233f477444f..2b2b02e0645 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: labels +# +# id :integer not null, primary key +# title :string(255) +# color :string(255) +# project_id :integer +# created_at :datetime +# updated_at :datetime +# + class Label < ActiveRecord::Base DEFAULT_COLOR = '#428BCA' diff --git a/app/models/label_link.rb b/app/models/label_link.rb index 47bd6eaf35f..b94c9c777af 100644 --- a/app/models/label_link.rb +++ b/app/models/label_link.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: label_links +# +# id :integer not null, primary key +# label_id :integer +# target_id :integer +# target_type :string(255) +# created_at :datetime +# updated_at :datetime +# + class LabelLink < ActiveRecord::Base belongs_to :target, polymorphic: true belongs_to :label diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b5705ef151d..10bd76b1c35 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -17,6 +17,7 @@ # target_project_id :integer not null # iid :integer # description :text +# position :integer default(0) # require Rails.root.join("app/models/commit") diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 248fa18353e..409e82ed1ef 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -3,7 +3,7 @@ # Table name: merge_request_diffs # # id :integer not null, primary key -# state :string(255) default("collected"), not null +# state :string(255) # st_commits :text # st_diffs :text # merge_request_id :integer not null diff --git a/app/models/project.rb b/app/models/project.rb index 7f6aa6d4249..c991bf6467c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -22,7 +22,8 @@ # visibility_level :integer default(0), not null # archived :boolean default(FALSE), not null # import_status :string(255) -# star_count :integer +# repository_size :float default(0.0) +# star_count :integer default(0), not null # class Project < ActiveRecord::Base diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb index fd34a2a35ea..1a107f92c93 100644 --- a/app/models/project_services/ci_service.rb +++ b/app/models/project_services/ci_service.rb @@ -1,3 +1,22 @@ +# == Schema Information +# +# Table name: services +# +# id :integer not null, primary key +# type :string(255) +# title :string(255) +# token :string(255) +# project_id :integer not null +# created_at :datetime +# updated_at :datetime +# active :boolean default(FALSE), not null +# project_url :string(255) +# subdomain :string(255) +# room :string(255) +# recipients :text +# api_key :string(255) +# + # Base class for CI services # List methods you need to implement to get your CI service # working with GitLab Merge Requests diff --git a/app/models/users_star_project.rb b/app/models/users_star_project.rb index 80e756bd00c..3d49cb05949 100644 --- a/app/models/users_star_project.rb +++ b/app/models/users_star_project.rb @@ -2,11 +2,11 @@ # # Table name: users_star_projects # -# id :integer not null, primary key -# starrer_id :integer not null -# project_id :integer not null -# created_at :datetime -# updated_at :datetime +# id :integer not null, primary key +# project_id :integer not null +# user_id :integer not null +# created_at :datetime +# updated_at :datetime # class UsersStarProject < ActiveRecord::Base diff --git a/spec/factories/label_links.rb b/spec/factories/label_links.rb index d6b6f8581f6..bd304b5db6b 100644 --- a/spec/factories/label_links.rb +++ b/spec/factories/label_links.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: label_links +# +# id :integer not null, primary key +# label_id :integer +# target_id :integer +# target_type :string(255) +# created_at :datetime +# updated_at :datetime +# + # Read about factories at https://github.com/thoughtbot/factory_girl FactoryGirl.define do diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb index af9f3efa641..6829387c660 100644 --- a/spec/factories/labels.rb +++ b/spec/factories/labels.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: labels +# +# id :integer not null, primary key +# title :string(255) +# color :string(255) +# project_id :integer +# created_at :datetime +# updated_at :datetime +# + # Read about factories at https://github.com/thoughtbot/factory_girl FactoryGirl.define do diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb index 3319262c015..0ae8ea5f878 100644 --- a/spec/factories/merge_requests.rb +++ b/spec/factories/merge_requests.rb @@ -1,3 +1,25 @@ +# == Schema Information +# +# Table name: merge_requests +# +# id :integer not null, primary key +# target_branch :string(255) not null +# source_branch :string(255) not null +# source_project_id :integer not null +# author_id :integer +# assignee_id :integer +# title :string(255) +# created_at :datetime +# updated_at :datetime +# milestone_id :integer +# state :string(255) +# merge_status :string(255) +# target_project_id :integer not null +# iid :integer +# description :text +# position :integer default(0) +# + FactoryGirl.define do factory :merge_request do title diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index a55ccf289dd..83d0cc62dbf 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -1,3 +1,22 @@ +# == Schema Information +# +# Table name: notes +# +# id :integer not null, primary key +# note :text +# noteable_type :string(255) +# author_id :integer +# created_at :datetime +# updated_at :datetime +# project_id :integer +# attachment :string(255) +# line_code :string(255) +# commit_id :string(255) +# noteable_id :integer +# system :boolean default(FALSE), not null +# st_diff :text +# + require_relative '../support/repo_helpers' FactoryGirl.define do diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 353d9d645ef..5324654c48c 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -1,3 +1,31 @@ +# == Schema Information +# +# Table name: projects +# +# id :integer not null, primary key +# name :string(255) +# path :string(255) +# description :text +# created_at :datetime +# updated_at :datetime +# creator_id :integer +# issues_enabled :boolean default(TRUE), not null +# wall_enabled :boolean default(TRUE), not null +# merge_requests_enabled :boolean default(TRUE), not null +# wiki_enabled :boolean default(TRUE), not null +# namespace_id :integer +# issues_tracker :string(255) default("gitlab"), not null +# issues_tracker_id :string(255) +# snippets_enabled :boolean default(TRUE), not null +# last_activity_at :datetime +# import_url :string(255) +# visibility_level :integer default(0), not null +# archived :boolean default(FALSE), not null +# import_status :string(255) +# repository_size :float default(0.0) +# star_count :integer default(0), not null +# + FactoryGirl.define do factory :empty_project, class: 'Project' do sequence(:name) { |n| "project#{n}" } diff --git a/spec/models/label_link_spec.rb b/spec/models/label_link_spec.rb index 078e61a7d62..0db60432ad3 100644 --- a/spec/models/label_link_spec.rb +++ b/spec/models/label_link_spec.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: label_links +# +# id :integer not null, primary key +# label_id :integer +# target_id :integer +# target_type :string(255) +# created_at :datetime +# updated_at :datetime +# + require 'spec_helper' describe LabelLink do diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb index 1d273e59bde..31634648f04 100644 --- a/spec/models/label_spec.rb +++ b/spec/models/label_spec.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: labels +# +# id :integer not null, primary key +# title :string(255) +# color :string(255) +# project_id :integer +# created_at :datetime +# updated_at :datetime +# + require 'spec_helper' describe Label do diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index ec6d29de82b..c40f75290ed 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -17,6 +17,7 @@ # target_project_id :integer not null # iid :integer # description :text +# position :integer default(0) # require 'spec_helper' diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 82ab97cdd7a..1c11ac39567 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -22,6 +22,8 @@ # visibility_level :integer default(0), not null # archived :boolean default(FALSE), not null # import_status :string(255) +# repository_size :float default(0.0) +# star_count :integer default(0), not null # require 'spec_helper' |