Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
0fbd6244
Commit
0fbd6244
authored
Sep 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'annotate-models' into 'master'
Re-annotate models See merge request !1253
parents
14805d6f
d7812a95
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
208 additions
and
138 deletions
+208
-138
app/models/abuse_report.rb
app/models/abuse_report.rb
+12
-0
app/models/issue.rb
app/models/issue.rb
+14
-13
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
app/models/note.rb
app/models/note.rb
+1
-0
app/models/project_services/drone_ci_service.rb
app/models/project_services/drone_ci_service.rb
+20
-0
app/models/sent_notification.rb
app/models/sent_notification.rb
+13
-0
app/models/user.rb
app/models/user.rb
+52
-56
spec/factories/abuse_reports.rb
spec/factories/abuse_reports.rb
+12
-0
spec/factories/merge_requests.rb
spec/factories/merge_requests.rb
+1
-0
spec/factories/notes.rb
spec/factories/notes.rb
+1
-0
spec/models/abuse_report_spec.rb
spec/models/abuse_report_spec.rb
+12
-0
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+1
-0
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+14
-13
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+1
-0
spec/models/note_spec.rb
spec/models/note_spec.rb
+1
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+52
-56
No files found.
app/models/abuse_report.rb
View file @
0fbd6244
# == Schema Information
#
# Table name: abuse_reports
#
# id :integer not null, primary key
# reporter_id :integer
# user_id :integer
# message :text
# created_at :datetime
# updated_at :datetime
#
class
AbuseReport
<
ActiveRecord
::
Base
belongs_to
:reporter
,
class_name:
"User"
belongs_to
:user
...
...
app/models/issue.rb
View file @
0fbd6244
...
...
@@ -15,6 +15,7 @@
# milestone_id :integer
# state :string(255)
# iid :integer
# updated_by_id :integer
#
require
'carrierwave/orm/activerecord'
...
...
app/models/merge_request.rb
View file @
0fbd6244
...
...
@@ -19,6 +19,7 @@
# description :text
# position :integer default(0)
# locked_at :datetime
# updated_by_id :integer
#
require
Rails
.
root
.
join
(
"app/models/commit"
)
...
...
app/models/note.rb
View file @
0fbd6244
...
...
@@ -15,6 +15,7 @@
# noteable_id :integer
# system :boolean default(FALSE), not null
# st_diff :text
# updated_by_id :integer
#
require
'carrierwave/orm/activerecord'
...
...
app/models/project_services/drone_ci_service.rb
View file @
0fbd6244
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
class
DroneCiService
<
CiService
prop_accessor
:drone_url
,
:token
,
:enable_ssl_verification
...
...
app/models/sent_notification.rb
View file @
0fbd6244
# == Schema Information
#
# Table name: sent_notifications
#
# id :integer not null, primary key
# project_id :integer
# noteable_id :integer
# noteable_type :string(255)
# recipient_id :integer
# commit_id :string(255)
# reply_key :string(255) not null
#
class
SentNotification
<
ActiveRecord
::
Base
belongs_to
:project
belongs_to
:noteable
,
polymorphic:
true
...
...
app/models/user.rb
View file @
0fbd6244
...
...
@@ -42,13 +42,9 @@
# unconfirmed_email :string(255)
# hide_no_ssh_key :boolean default(FALSE)
# website_url :string(255) default(""), not null
# github_access_token :string(255)
# gitlab_access_token :string(255)
# notification_email :string(255)
# hide_no_password :boolean default(FALSE)
# password_automatically_set :boolean default(FALSE)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
...
...
spec/factories/abuse_reports.rb
View file @
0fbd6244
# == Schema Information
#
# Table name: abuse_reports
#
# id :integer not null, primary key
# reporter_id :integer
# user_id :integer
# message :text
# created_at :datetime
# updated_at :datetime
#
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
...
...
spec/factories/merge_requests.rb
View file @
0fbd6244
...
...
@@ -19,6 +19,7 @@
# description :text
# position :integer default(0)
# locked_at :datetime
# updated_by_id :integer
#
FactoryGirl
.
define
do
...
...
spec/factories/notes.rb
View file @
0fbd6244
...
...
@@ -15,6 +15,7 @@
# noteable_id :integer
# system :boolean default(FALSE), not null
# st_diff :text
# updated_by_id :integer
#
require_relative
'../support/repo_helpers'
...
...
spec/models/abuse_report_spec.rb
View file @
0fbd6244
# == Schema Information
#
# Table name: abuse_reports
#
# id :integer not null, primary key
# reporter_id :integer
# user_id :integer
# message :text
# created_at :datetime
# updated_at :datetime
#
require
'rails_helper'
RSpec
.
describe
AbuseReport
,
type: :model
do
...
...
spec/models/application_setting_spec.rb
View file @
0fbd6244
...
...
@@ -22,6 +22,7 @@
# user_oauth_applications :boolean default(TRUE)
# after_sign_out_path :string(255)
# session_expire_delay :integer default(10080), not null
# import_sources :text
#
require
'spec_helper'
...
...
spec/models/issue_spec.rb
View file @
0fbd6244
...
...
@@ -15,6 +15,7 @@
# milestone_id :integer
# state :string(255)
# iid :integer
# updated_by_id :integer
#
require
'spec_helper'
...
...
spec/models/merge_request_spec.rb
View file @
0fbd6244
...
...
@@ -19,6 +19,7 @@
# description :text
# position :integer default(0)
# locked_at :datetime
# updated_by_id :integer
#
require
'spec_helper'
...
...
spec/models/note_spec.rb
View file @
0fbd6244
...
...
@@ -15,6 +15,7 @@
# noteable_id :integer
# system :boolean default(FALSE), not null
# st_diff :text
# updated_by_id :integer
#
require
'spec_helper'
...
...
spec/models/user_spec.rb
View file @
0fbd6244
...
...
@@ -42,13 +42,9 @@
# unconfirmed_email :string(255)
# hide_no_ssh_key :boolean default(FALSE)
# website_url :string(255) default(""), not null
# github_access_token :string(255)
# gitlab_access_token :string(255)
# notification_email :string(255)
# hide_no_password :boolean default(FALSE)
# password_automatically_set :boolean default(FALSE)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# encrypted_otp_secret :string(255)
# encrypted_otp_secret_iv :string(255)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment