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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6e35acef
Commit
6e35acef
authored
Jun 19, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Annotated
parent
78680a81
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
42 changed files
with
198 additions
and
68 deletions
+198
-68
app/models/campfire_service.rb
app/models/campfire_service.rb
+2
-0
app/models/deploy_key.rb
app/models/deploy_key.rb
+14
-0
app/models/deploy_keys_project.rb
app/models/deploy_keys_project.rb
+11
-0
app/models/forked_project_link.rb
app/models/forked_project_link.rb
+11
-0
app/models/gitlab_ci_service.rb
app/models/gitlab_ci_service.rb
+2
-0
app/models/hipchat_service.rb
app/models/hipchat_service.rb
+3
-1
app/models/issue.rb
app/models/issue.rb
+2
-2
app/models/key.rb
app/models/key.rb
+3
-3
app/models/merge_request.rb
app/models/merge_request.rb
+2
-2
app/models/note.rb
app/models/note.rb
+2
-2
app/models/personal_snippet.rb
app/models/personal_snippet.rb
+5
-4
app/models/project.rb
app/models/project.rb
+3
-2
app/models/project_hook.rb
app/models/project_hook.rb
+2
-2
app/models/project_snippet.rb
app/models/project_snippet.rb
+5
-4
app/models/service.rb
app/models/service.rb
+2
-0
app/models/service_hook.rb
app/models/service_hook.rb
+2
-2
app/models/snippet.rb
app/models/snippet.rb
+5
-4
app/models/system_hook.rb
app/models/system_hook.rb
+2
-2
app/models/user.rb
app/models/user.rb
+5
-3
app/models/users_group.rb
app/models/users_group.rb
+12
-0
app/models/users_project.rb
app/models/users_project.rb
+2
-2
app/models/web_hook.rb
app/models/web_hook.rb
+2
-2
spec/factories/forked_project_links.rb
spec/factories/forked_project_links.rb
+11
-0
spec/factories/users_groups.rb
spec/factories/users_groups.rb
+12
-0
spec/models/deploy_key_spec.rb
spec/models/deploy_key_spec.rb
+3
-3
spec/models/deploy_keys_project_spec.rb
spec/models/deploy_keys_project_spec.rb
+11
-0
spec/models/forked_project_link_spec.rb
spec/models/forked_project_link_spec.rb
+11
-0
spec/models/gitlab_ci_service_spec.rb
spec/models/gitlab_ci_service_spec.rb
+2
-0
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+2
-2
spec/models/key_spec.rb
spec/models/key_spec.rb
+3
-3
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+2
-2
spec/models/note_spec.rb
spec/models/note_spec.rb
+2
-2
spec/models/project_snippet_spec.rb
spec/models/project_snippet_spec.rb
+5
-3
spec/models/project_spec.rb
spec/models/project_spec.rb
+3
-2
spec/models/service_hook_spec.rb
spec/models/service_hook_spec.rb
+2
-2
spec/models/service_spec.rb
spec/models/service_spec.rb
+2
-0
spec/models/snippet_spec.rb
spec/models/snippet_spec.rb
+5
-3
spec/models/system_hook_spec.rb
spec/models/system_hook_spec.rb
+2
-2
spec/models/user_spec.rb
spec/models/user_spec.rb
+5
-3
spec/models/users_group_spec.rb
spec/models/users_group_spec.rb
+12
-0
spec/models/users_project_spec.rb
spec/models/users_project_spec.rb
+2
-2
spec/models/web_hook_spec.rb
spec/models/web_hook_spec.rb
+2
-2
No files found.
app/models/campfire_service.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
class
CampfireService
<
Service
...
...
app/models/deploy_key.rb
View file @
6e35acef
# == Schema Information
#
# Table name: keys
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# identifier :string(255)
# type :string(255)
#
class
DeployKey
<
Key
has_many
:deploy_keys_projects
,
dependent: :destroy
has_many
:projects
,
through: :deploy_keys_projects
...
...
app/models/deploy_keys_project.rb
View file @
6e35acef
# == Schema Information
#
# Table name: deploy_keys_projects
#
# id :integer not null, primary key
# deploy_key_id :integer not null
# project_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
class
DeployKeysProject
<
ActiveRecord
::
Base
attr_accessible
:key_id
,
:project_id
...
...
app/models/forked_project_link.rb
View file @
6e35acef
# == Schema Information
#
# Table name: forked_project_links
#
# id :integer not null, primary key
# forked_to_project_id :integer not null
# forked_from_project_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
class
ForkedProjectLink
<
ActiveRecord
::
Base
attr_accessible
:forked_from_project_id
,
:forked_to_project_id
...
...
app/models/gitlab_ci_service.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
class
GitlabCiService
<
Service
...
...
app/models/hipchat_service.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
class
HipchatService
<
Service
...
...
@@ -70,4 +72,4 @@ class HipchatService < Service
message
end
end
\ No newline at end of file
end
app/models/issue.rb
View file @
6e35acef
...
...
@@ -7,8 +7,8 @@
# assignee_id :integer
# author_id :integer
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# position :integer default(0)
# branch_name :string(255)
# description :text
...
...
app/models/key.rb
View file @
6e35acef
...
...
@@ -4,12 +4,12 @@
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# identifier :string(255)
#
project_id :integer
#
type :string(255)
#
require
'digest/md5'
...
...
app/models/merge_request.rb
View file @
6e35acef
...
...
@@ -9,8 +9,8 @@
# author_id :integer
# assignee_id :integer
# title :string(255)
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
# milestone_id :integer
...
...
app/models/note.rb
View file @
6e35acef
...
...
@@ -6,8 +6,8 @@
# note :text
# noteable_type :string(255)
# author_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# project_id :integer
# attachment :string(255)
# line_code :string(255)
...
...
app/models/personal_snippet.rb
View file @
6e35acef
...
...
@@ -6,13 +6,14 @@
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
not null
# created_at :datetime
not null
# updated_at :datetime
not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
# type :string(255)
#
private :boolean
#
class
PersonalSnippet
<
Snippet
end
app/models/project.rb
View file @
6e35acef
...
...
@@ -6,8 +6,8 @@
# name :string(255)
# path :string(255)
# description :text
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# creator_id :integer
# default_branch :string(255)
# issues_enabled :boolean default(TRUE), not null
...
...
@@ -20,6 +20,7 @@
# issues_tracker_id :string(255)
# snippets_enabled :boolean default(TRUE), not null
# last_activity_at :datetime
# imported :boolean default(FALSE), not null
#
require
"grit"
...
...
app/models/project_hook.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
app/models/project_snippet.rb
View file @
6e35acef
...
...
@@ -6,13 +6,14 @@
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
not null
# created_at :datetime
not null
# updated_at :datetime
not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
# type :string(255)
#
private :boolean
#
class
ProjectSnippet
<
Snippet
belongs_to
:project
...
...
app/models/service.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
# To add new service you should build a class inherited from Service
...
...
app/models/service_hook.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
app/models/snippet.rb
View file @
6e35acef
...
...
@@ -6,13 +6,14 @@
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
not null
# created_at :datetime
not null
# updated_at :datetime
not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
# type :string(255)
#
private :boolean
#
class
Snippet
<
ActiveRecord
::
Base
include
Linguist
::
BlobHelper
...
...
app/models/system_hook.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
app/models/user.rb
View file @
6e35acef
...
...
@@ -4,7 +4,7 @@
#
# id :integer not null, primary key
# email :string(255) default(""), not null
# encrypted_password :string(
255
) default(""), not null
# encrypted_password :string(
128
) default(""), not null
# reset_password_token :string(255)
# reset_password_sent_at :datetime
# remember_created_at :datetime
...
...
@@ -13,8 +13,8 @@
# last_sign_in_at :datetime
# current_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# name :string(255)
# admin :boolean default(FALSE), not null
# projects_limit :integer default(10)
...
...
@@ -34,6 +34,8 @@
# state :string(255)
# color_scheme_id :integer default(1), not null
# notification_level :integer default(1), not null
# password_expires_at :datetime
# created_by_id :integer
#
class
User
<
ActiveRecord
::
Base
...
...
app/models/users_group.rb
View file @
6e35acef
# == Schema Information
#
# Table name: users_groups
#
# id :integer not null, primary key
# group_access :integer not null
# group_id :integer not null
# user_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
class
UsersGroup
<
ActiveRecord
::
Base
GUEST
=
10
REPORTER
=
20
...
...
app/models/users_project.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# user_id :integer not null
# project_id :integer not null
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# project_access :integer default(0), not null
# notification_level :integer default(3), not null
#
...
...
app/models/web_hook.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
spec/factories/forked_project_links.rb
View file @
6e35acef
# == Schema Information
#
# Table name: forked_project_links
#
# id :integer not null, primary key
# forked_to_project_id :integer not null
# forked_from_project_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
...
...
spec/factories/users_groups.rb
View file @
6e35acef
# == Schema Information
#
# Table name: users_groups
#
# id :integer not null, primary key
# group_access :integer not null
# group_id :integer not null
# user_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
FactoryGirl
.
define
do
factory
:users_group
do
group_access
{
UsersGroup
::
OWNER
}
...
...
spec/models/deploy_key_spec.rb
View file @
6e35acef
...
...
@@ -4,12 +4,12 @@
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# identifier :string(255)
#
project_id :integer
#
type :string(255)
#
require
'spec_helper'
...
...
spec/models/deploy_keys_project_spec.rb
View file @
6e35acef
# == Schema Information
#
# Table name: deploy_keys_projects
#
# id :integer not null, primary key
# deploy_key_id :integer not null
# project_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
require
'spec_helper'
describe
DeployKeysProject
do
...
...
spec/models/forked_project_link_spec.rb
View file @
6e35acef
# == Schema Information
#
# Table name: forked_project_links
#
# id :integer not null, primary key
# forked_to_project_id :integer not null
# forked_from_project_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
require
'spec_helper'
describe
ForkedProjectLink
,
"add link on fork"
do
...
...
spec/models/gitlab_ci_service_spec.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
require
'spec_helper'
...
...
spec/models/issue_spec.rb
View file @
6e35acef
...
...
@@ -7,8 +7,8 @@
# assignee_id :integer
# author_id :integer
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# position :integer default(0)
# branch_name :string(255)
# description :text
...
...
spec/models/key_spec.rb
View file @
6e35acef
...
...
@@ -4,12 +4,12 @@
#
# id :integer not null, primary key
# user_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# key :text
# title :string(255)
# identifier :string(255)
#
project_id :integer
#
type :string(255)
#
require
'spec_helper'
...
...
spec/models/merge_request_spec.rb
View file @
6e35acef
...
...
@@ -9,8 +9,8 @@
# author_id :integer
# assignee_id :integer
# title :string(255)
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# st_commits :text(2147483647)
# st_diffs :text(2147483647)
# milestone_id :integer
...
...
spec/models/note_spec.rb
View file @
6e35acef
...
...
@@ -6,8 +6,8 @@
# note :text
# noteable_type :string(255)
# author_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# project_id :integer
# attachment :string(255)
# line_code :string(255)
...
...
spec/models/project_snippet_spec.rb
View file @
6e35acef
...
...
@@ -6,11 +6,13 @@
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
not null
# created_at :datetime
not null
# updated_at :datetime
not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
# type :string(255)
#
require
'spec_helper'
...
...
spec/models/project_spec.rb
View file @
6e35acef
...
...
@@ -6,8 +6,8 @@
# name :string(255)
# path :string(255)
# description :text
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# creator_id :integer
# default_branch :string(255)
# issues_enabled :boolean default(TRUE), not null
...
...
@@ -20,6 +20,7 @@
# issues_tracker_id :string(255)
# snippets_enabled :boolean default(TRUE), not null
# last_activity_at :datetime
# imported :boolean default(FALSE), not null
#
require
'spec_helper'
...
...
spec/models/service_hook_spec.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
spec/models/service_spec.rb
View file @
6e35acef
...
...
@@ -11,6 +11,8 @@
# updated_at :datetime not null
# active :boolean default(FALSE), not null
# project_url :string(255)
# subdomain :string(255)
# room :string(255)
#
require
'spec_helper'
...
...
spec/models/snippet_spec.rb
View file @
6e35acef
...
...
@@ -6,11 +6,13 @@
# title :string(255)
# content :text
# author_id :integer not null
# project_id :integer
not null
# created_at :datetime
not null
# updated_at :datetime
not null
# project_id :integer
# created_at :datetime
# updated_at :datetime
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
# type :string(255)
#
require
'spec_helper'
...
...
spec/models/system_hook_spec.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
spec/models/user_spec.rb
View file @
6e35acef
...
...
@@ -4,7 +4,7 @@
#
# id :integer not null, primary key
# email :string(255) default(""), not null
# encrypted_password :string(
255
) default(""), not null
# encrypted_password :string(
128
) default(""), not null
# reset_password_token :string(255)
# reset_password_sent_at :datetime
# remember_created_at :datetime
...
...
@@ -13,8 +13,8 @@
# last_sign_in_at :datetime
# current_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# name :string(255)
# admin :boolean default(FALSE), not null
# projects_limit :integer default(10)
...
...
@@ -34,6 +34,8 @@
# state :string(255)
# color_scheme_id :integer default(1), not null
# notification_level :integer default(1), not null
# password_expires_at :datetime
# created_by_id :integer
#
require
'spec_helper'
...
...
spec/models/users_group_spec.rb
View file @
6e35acef
# == Schema Information
#
# Table name: users_groups
#
# id :integer not null, primary key
# group_access :integer not null
# group_id :integer not null
# user_id :integer not null
# created_at :datetime not null
# updated_at :datetime not null
#
require
'spec_helper'
describe
UsersGroup
do
...
...
spec/models/users_project_spec.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# user_id :integer not null
# project_id :integer not null
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# project_access :integer default(0), not null
# notification_level :integer default(3), not null
#
...
...
spec/models/web_hook_spec.rb
View file @
6e35acef
...
...
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
# created_at :datetime
not null
# updated_at :datetime
not null
# created_at :datetime
# updated_at :datetime
# type :string(255) default("ProjectHook")
# service_id :integer
#
...
...
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