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
Boxiang Sun
gitlab-ce
Commits
a3157626
Commit
a3157626
authored
May 03, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-annotate models
parent
e22936c6
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
118 additions
and
26 deletions
+118
-26
app/models/application_setting.rb
app/models/application_setting.rb
+3
-4
app/models/deploy_key.rb
app/models/deploy_key.rb
+1
-1
app/models/key.rb
app/models/key.rb
+1
-0
app/models/member.rb
app/models/member.rb
+3
-3
app/models/members/group_member.rb
app/models/members/group_member.rb
+5
-1
app/models/members/project_member.rb
app/models/members/project_member.rb
+5
-1
app/models/project_import_data.rb
app/models/project_import_data.rb
+4
-4
app/models/project_services/ci_service.rb
app/models/project_services/ci_service.rb
+1
-0
app/models/project_services/custom_issue_tracker_service.rb
app/models/project_services/custom_issue_tracker_service.rb
+1
-0
app/models/project_services/emails_on_push_service.rb
app/models/project_services/emails_on_push_service.rb
+1
-0
app/models/project_services/external_wiki_service.rb
app/models/project_services/external_wiki_service.rb
+14
-8
app/models/project_services/flowdock_service.rb
app/models/project_services/flowdock_service.rb
+1
-0
app/models/project_services/gemnasium_service.rb
app/models/project_services/gemnasium_service.rb
+1
-0
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+1
-0
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+1
-0
app/models/project_services/irker_service.rb
app/models/project_services/irker_service.rb
+1
-0
app/models/service.rb
app/models/service.rb
+1
-0
app/models/user.rb
app/models/user.rb
+1
-0
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+4
-1
spec/models/deploy_key_spec.rb
spec/models/deploy_key_spec.rb
+1
-0
spec/models/external_wiki_service_spec.rb
spec/models/external_wiki_service_spec.rb
+20
-0
spec/models/key_spec.rb
spec/models/key_spec.rb
+1
-0
spec/models/member_spec.rb
spec/models/member_spec.rb
+19
-0
spec/models/members/group_member_spec.rb
spec/models/members/group_member_spec.rb
+5
-1
spec/models/members/project_member_spec.rb
spec/models/members/project_member_spec.rb
+5
-1
spec/models/project_services/asana_service_spec.rb
spec/models/project_services/asana_service_spec.rb
+1
-0
spec/models/project_services/assembla_service_spec.rb
spec/models/project_services/assembla_service_spec.rb
+1
-0
spec/models/project_services/buildkite_service_spec.rb
spec/models/project_services/buildkite_service_spec.rb
+1
-0
spec/models/project_services/flowdock_service_spec.rb
spec/models/project_services/flowdock_service_spec.rb
+1
-0
spec/models/project_services/gemnasium_service_spec.rb
spec/models/project_services/gemnasium_service_spec.rb
+1
-0
spec/models/project_services/gitlab_ci_service_spec.rb
spec/models/project_services/gitlab_ci_service_spec.rb
+1
-0
spec/models/project_services/gitlab_issue_tracker_service_spec.rb
...els/project_services/gitlab_issue_tracker_service_spec.rb
+1
-0
spec/models/project_services/hipchat_service_spec.rb
spec/models/project_services/hipchat_service_spec.rb
+3
-1
spec/models/project_services/irker_service_spec.rb
spec/models/project_services/irker_service_spec.rb
+1
-0
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+1
-0
spec/models/project_services/pushover_service_spec.rb
spec/models/project_services/pushover_service_spec.rb
+1
-0
spec/models/project_services/slack_service_spec.rb
spec/models/project_services/slack_service_spec.rb
+1
-0
spec/models/service_spec.rb
spec/models/service_spec.rb
+1
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+2
-0
No files found.
app/models/application_setting.rb
View file @
a3157626
...
...
@@ -2,13 +2,11 @@
#
# Table name: application_settings
#
# id :integer not null, primary key
# id :integer
not null, primary key
# default_projects_limit :integer
# default_branch_protection :integer
# signup_enabled :boolean
# signin_enabled :boolean
# gravatar_enabled :boolean
# twitter_sharing_enabled :boolean
# sign_in_text :text
# created_at :datetime
# updated_at :datetime
...
...
@@ -16,8 +14,9 @@
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
# restricted_visibility_levels :text
# max_attachment_size :integer default(10)
# max_attachment_size :integer default(10)
, not null
# default_project_visibility :integer
# default_snippet_visibility :integer
# restricted_signup_domains :text
#
...
...
app/models/deploy_key.rb
View file @
a3157626
...
...
@@ -7,10 +7,10 @@
# created_at :datetime
# updated_at :datetime
# key :text
# public :boolean default(FALSE)
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
class
DeployKey
<
Key
...
...
app/models/key.rb
View file @
a3157626
...
...
@@ -10,6 +10,7 @@
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
require
'digest/md5'
...
...
app/models/member.rb
View file @
a3157626
...
...
@@ -6,14 +6,14 @@
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string
# invite_token :string
# invite_email :string
(255)
# invite_token :string
(255)
# invite_accepted_at :datetime
#
...
...
app/models/members/group_member.rb
View file @
a3157626
...
...
@@ -6,11 +6,15 @@
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
class
GroupMember
<
Member
...
...
app/models/members/project_member.rb
View file @
a3157626
...
...
@@ -6,11 +6,15 @@
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
class
ProjectMember
<
Member
...
...
app/models/project_import_data.rb
View file @
a3157626
# == Schema Information
#
# Table name: project_import_data
s
# Table name: project_import_data
#
# id
:integer not null, primary key
# project_id
:integer
# data
:text
# id :integer not null, primary key
# project_id :integer
# data :text
#
require
'carrierwave/orm/activerecord'
...
...
app/models/project_services/ci_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
# Base class for CI services
...
...
app/models/project_services/custom_issue_tracker_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# 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
CustomIssueTrackerService
<
IssueTrackerService
...
...
app/models/project_services/emails_on_push_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# 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
EmailsOnPushService
<
Service
...
...
app/models/project_services/external_wiki_service.rb
View file @
a3157626
...
...
@@ -2,14 +2,20 @@
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer not null
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# 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
ExternalWikiService
<
Service
...
...
app/models/project_services/flowdock_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
"flowdock-git-hook"
...
...
app/models/project_services/gemnasium_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
"gemnasium/gitlab_service"
...
...
app/models/project_services/gitlab_ci_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# 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
GitlabCiService
<
CiService
...
...
app/models/project_services/hipchat_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# 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
HipchatService
<
Service
...
...
app/models/project_services/irker_service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'uri'
...
...
app/models/service.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
# To add new service you should build a class inherited from Service
...
...
app/models/user.rb
View file @
a3157626
...
...
@@ -49,6 +49,7 @@
# password_automatically_set :boolean default(FALSE)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
#
...
...
spec/models/application_setting_spec.rb
View file @
a3157626
...
...
@@ -4,7 +4,6 @@
#
# id :integer not null, primary key
# default_projects_limit :integer
# default_branch_protection :integer
# signup_enabled :boolean
# signin_enabled :boolean
# gravatar_enabled :boolean
...
...
@@ -15,6 +14,10 @@
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
# restricted_visibility_levels :text
# max_attachment_size :integer default(10), not null
# default_project_visibility :integer
# default_snippet_visibility :integer
# restricted_signup_domains :text
#
require
'spec_helper'
...
...
spec/models/deploy_key_spec.rb
View file @
a3157626
...
...
@@ -10,6 +10,7 @@
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
require
'spec_helper'
...
...
spec/models/external_wiki_service_spec.rb
View file @
a3157626
# == 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
#
require
'spec_helper'
describe
ExternalWikiService
do
...
...
spec/models/key_spec.rb
View file @
a3157626
...
...
@@ -10,6 +10,7 @@
# title :string(255)
# type :string(255)
# fingerprint :string(255)
# public :boolean default(FALSE), not null
#
require
'spec_helper'
...
...
spec/models/member_spec.rb
View file @
a3157626
# == Schema Information
#
# Table name: members
#
# id :integer not null, primary key
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
require
'spec_helper'
describe
Member
do
...
...
spec/models/members/group_member_spec.rb
View file @
a3157626
...
...
@@ -6,11 +6,15 @@
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
require
'spec_helper'
...
...
spec/models/members/project_member_spec.rb
View file @
a3157626
...
...
@@ -6,11 +6,15 @@
# access_level :integer not null
# source_id :integer not null
# source_type :string(255) not null
# user_id :integer
not null
# user_id :integer
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#
require
'spec_helper'
...
...
spec/models/project_services/asana_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/assembla_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/buildkite_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/flowdock_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/gemnasium_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/gitlab_ci_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/gitlab_issue_tracker_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/hipchat_service_spec.rb
View file @
a3157626
...
...
@@ -5,15 +5,17 @@
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
not null
# 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
#
require
'spec_helper'
...
...
spec/models/project_services/irker_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/jira_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/pushover_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/project_services/slack_service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/service_spec.rb
View file @
a3157626
...
...
@@ -15,6 +15,7 @@
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#
require
'spec_helper'
...
...
spec/models/user_spec.rb
View file @
a3157626
...
...
@@ -49,6 +49,8 @@
# password_automatically_set :boolean default(FALSE)
# bitbucket_access_token :string(255)
# bitbucket_access_token_secret :string(255)
# location :string(255)
# public_email :string(255) default(""), not null
#
require
'spec_helper'
...
...
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