diff options
Diffstat (limited to 'app')
| -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 |
8 files changed, 52 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 |