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
Jérome Perrin
gitlab-ce
Commits
66c61f02
Commit
66c61f02
authored
Mar 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-annotate models
parent
63178a95
Changes
39
Show whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
462 additions
and
414 deletions
+462
-414
app/models/application_setting.rb
app/models/application_setting.rb
+11
-11
app/models/identity.rb
app/models/identity.rb
+2
-0
app/models/project_services/asana_service.rb
app/models/project_services/asana_service.rb
+9
-9
app/models/project_services/assembla_service.rb
app/models/project_services/assembla_service.rb
+9
-9
app/models/project_services/bamboo_service.rb
app/models/project_services/bamboo_service.rb
+9
-9
app/models/project_services/buildbox_service.rb
app/models/project_services/buildbox_service.rb
+10
-9
app/models/project_services/campfire_service.rb
app/models/project_services/campfire_service.rb
+9
-9
app/models/project_services/ci_service.rb
app/models/project_services/ci_service.rb
+13
-13
app/models/project_services/custom_issue_tracker_service.rb
app/models/project_services/custom_issue_tracker_service.rb
+13
-9
app/models/project_services/emails_on_push_service.rb
app/models/project_services/emails_on_push_service.rb
+13
-13
app/models/project_services/flowdock_service.rb
app/models/project_services/flowdock_service.rb
+13
-13
app/models/project_services/gemnasium_service.rb
app/models/project_services/gemnasium_service.rb
+13
-13
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+13
-13
app/models/project_services/gitlab_issue_tracker_service.rb
app/models/project_services/gitlab_issue_tracker_service.rb
+9
-9
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+13
-13
app/models/project_services/irker_service.rb
app/models/project_services/irker_service.rb
+14
-9
app/models/project_services/issue_tracker_service.rb
app/models/project_services/issue_tracker_service.rb
+9
-9
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+9
-9
app/models/project_services/pivotaltracker_service.rb
app/models/project_services/pivotaltracker_service.rb
+9
-9
app/models/project_services/pushover_service.rb
app/models/project_services/pushover_service.rb
+9
-9
app/models/project_services/redmine_service.rb
app/models/project_services/redmine_service.rb
+9
-9
app/models/project_services/slack_service.rb
app/models/project_services/slack_service.rb
+9
-9
app/models/project_services/teamcity_service.rb
app/models/project_services/teamcity_service.rb
+9
-9
app/models/service.rb
app/models/service.rb
+13
-13
app/models/user.rb
app/models/user.rb
+47
-45
spec/models/application_setting_spec.rb
spec/models/application_setting_spec.rb
+11
-10
spec/models/asana_service_spec.rb
spec/models/asana_service_spec.rb
+13
-8
spec/models/project_services/assembla_service_spec.rb
spec/models/project_services/assembla_service_spec.rb
+6
-5
spec/models/project_services/buildbox_service_spec.rb
spec/models/project_services/buildbox_service_spec.rb
+6
-5
spec/models/project_services/flowdock_service_spec.rb
spec/models/project_services/flowdock_service_spec.rb
+6
-5
spec/models/project_services/gemnasium_service_spec.rb
spec/models/project_services/gemnasium_service_spec.rb
+6
-5
spec/models/project_services/gitlab_ci_service_spec.rb
spec/models/project_services/gitlab_ci_service_spec.rb
+6
-5
spec/models/project_services/gitlab_issue_tracker_service_spec.rb
...els/project_services/gitlab_issue_tracker_service_spec.rb
+14
-9
spec/models/project_services/irker_service_spec.rb
spec/models/project_services/irker_service_spec.rb
+13
-8
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+13
-8
spec/models/project_services/pushover_service_spec.rb
spec/models/project_services/pushover_service_spec.rb
+6
-5
spec/models/project_services/slack_service_spec.rb
spec/models/project_services/slack_service_spec.rb
+6
-5
spec/models/service_spec.rb
spec/models/service_spec.rb
+13
-13
spec/models/user_spec.rb
spec/models/user_spec.rb
+47
-41
No files found.
app/models/application_setting.rb
View file @
66c61f02
...
...
@@ -4,15 +4,15 @@
#
# 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
# home_page_url :string(255)
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
#
class
ApplicationSetting
<
ActiveRecord
::
Base
...
...
app/models/identity.rb
View file @
66c61f02
...
...
@@ -6,6 +6,8 @@
# extern_uid :string(255)
# provider :string(255)
# user_id :integer
# created_at :datetime
# updated_at :datetime
#
class
Identity
<
ActiveRecord
::
Base
...
...
app/models/project_services/asana_service.rb
View file @
66c61f02
app/models/project_services/assembla_service.rb
View file @
66c61f02
app/models/project_services/bamboo_service.rb
View file @
66c61f02
app/models/project_services/buildbox_service.rb
View file @
66c61f02
...
...
@@ -16,6 +16,7 @@
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
#
require
"addressable/uri"
class
BuildboxService
<
CiService
...
...
app/models/project_services/campfire_service.rb
View file @
66c61f02
app/models/project_services/ci_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
# Base class for CI services
...
...
app/models/project_services/custom_issue_tracker_service.rb
View file @
66c61f02
...
...
@@ -11,6 +11,10 @@
# 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)
#
class
CustomIssueTrackerService
<
IssueTrackerService
...
...
app/models/project_services/emails_on_push_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
class
EmailsOnPushService
<
Service
...
...
app/models/project_services/flowdock_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
require
"flowdock-git-hook"
...
...
app/models/project_services/gemnasium_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
require
"gemnasium/gitlab_service"
...
...
app/models/project_services/gitlab_ci_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
class
GitlabCiService
<
CiService
...
...
app/models/project_services/gitlab_issue_tracker_service.rb
View file @
66c61f02
app/models/project_services/hipchat_service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
class
HipchatService
<
Service
...
...
app/models/project_services/irker_service.rb
View file @
66c61f02
...
...
@@ -11,6 +11,11 @@
# 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)
#
require
'uri'
...
...
app/models/project_services/issue_tracker_service.rb
View file @
66c61f02
app/models/project_services/jira_service.rb
View file @
66c61f02
app/models/project_services/pivotaltracker_service.rb
View file @
66c61f02
app/models/project_services/pushover_service.rb
View file @
66c61f02
app/models/project_services/redmine_service.rb
View file @
66c61f02
app/models/project_services/slack_service.rb
View file @
66c61f02
app/models/project_services/teamcity_service.rb
View file @
66c61f02
app/models/service.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
# To add new service you should build a class inherited from Service
...
...
app/models/user.rb
View file @
66c61f02
...
...
@@ -34,19 +34,21 @@
# notification_level :integer default(1), not null
# password_expires_at :datetime
# created_by_id :integer
# last_credential_check_at :datetime
# avatar :string(255)
# confirmation_token :string(255)
# confirmed_at :datetime
# confirmation_sent_at :datetime
# unconfirmed_email :string(255)
# hide_no_ssh_key :boolean default(FALSE)
# hide_no_password :boolean default(FALSE)
# website_url :string(255) default(""), not null
# last_credential_check_at :datetime
# 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)
#
require
'carrierwave/orm/activerecord'
...
...
spec/models/application_setting_spec.rb
View file @
66c61f02
...
...
@@ -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
...
...
@@ -12,6 +11,8 @@
# created_at :datetime
# updated_at :datetime
# home_page_url :string(255)
# default_branch_protection :integer default(2)
# twitter_sharing_enabled :boolean default(TRUE)
#
require
'spec_helper'
...
...
spec/models/asana_service_spec.rb
View file @
66c61f02
...
...
@@ -5,11 +5,16 @@
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/assembla_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/buildbox_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/flowdock_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/gemnasium_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/gitlab_ci_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/gitlab_issue_tracker_service_spec.rb
View file @
66c61f02
...
...
@@ -11,7 +11,12 @@
# 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)
#
require
'spec_helper'
describe
GitlabIssueTrackerService
do
...
...
spec/models/project_services/irker_service_spec.rb
View file @
66c61f02
...
...
@@ -5,11 +5,16 @@
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/jira_service_spec.rb
View file @
66c61f02
...
...
@@ -5,11 +5,16 @@
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/pushover_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/project_services/slack_service_spec.rb
View file @
66c61f02
...
...
@@ -5,15 +5,16 @@
# 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
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# 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)
#
require
'spec_helper'
...
...
spec/models/service_spec.rb
View file @
66c61f02
...
...
@@ -11,10 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean
# issues_events :boolean
# merge_requests_events :boolean
# tag_push_events :boolean
# push_events :boolean
default(TRUE)
# issues_events :boolean
default(TRUE)
# merge_requests_events :boolean
default(TRUE)
# tag_push_events :boolean
default(TRUE)
#
require
'spec_helper'
...
...
spec/models/user_spec.rb
View file @
66c61f02
...
...
@@ -34,6 +34,7 @@
# notification_level :integer default(1), not null
# password_expires_at :datetime
# created_by_id :integer
# last_credential_check_at :datetime
# avatar :string(255)
# confirmation_token :string(255)
# confirmed_at :datetime
...
...
@@ -41,8 +42,13 @@
# unconfirmed_email :string(255)
# hide_no_ssh_key :boolean default(FALSE)
# website_url :string(255) default(""), not null
# last_credential_check_at :datetime
# 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)
#
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