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
6abc6495
Commit
6abc6495
authored
Jun 26, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reannotated
parent
283bf806
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
190 additions
and
142 deletions
+190
-142
app/models/event.rb
app/models/event.rb
+5
-4
app/models/issue.rb
app/models/issue.rb
+13
-12
app/models/key.rb
app/models/key.rb
+5
-5
app/models/merge_request.rb
app/models/merge_request.rb
+11
-7
app/models/milestone.rb
app/models/milestone.rb
+14
-0
app/models/note.rb
app/models/note.rb
+5
-5
app/models/project.rb
app/models/project.rb
+9
-9
app/models/protected_branch.rb
app/models/protected_branch.rb
+2
-2
app/models/snippet.rb
app/models/snippet.rb
+5
-5
app/models/user.rb
app/models/user.rb
+11
-7
app/models/users_project.rb
app/models/users_project.rb
+6
-6
app/models/web_hook.rb
app/models/web_hook.rb
+4
-4
app/models/wiki.rb
app/models/wiki.rb
+3
-3
spec/models/event_spec.rb
spec/models/event_spec.rb
+5
-4
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+13
-11
spec/models/key_spec.rb
spec/models/key_spec.rb
+5
-5
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+11
-7
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+14
-0
spec/models/note_spec.rb
spec/models/note_spec.rb
+5
-5
spec/models/project_spec.rb
spec/models/project_spec.rb
+9
-9
spec/models/protected_branch_spec.rb
spec/models/protected_branch_spec.rb
+2
-2
spec/models/snippet_spec.rb
spec/models/snippet_spec.rb
+5
-5
spec/models/user_spec.rb
spec/models/user_spec.rb
+11
-7
spec/models/users_project_spec.rb
spec/models/users_project_spec.rb
+6
-6
spec/models/web_hook_spec.rb
spec/models/web_hook_spec.rb
+4
-4
spec/models/wiki_spec.rb
spec/models/wiki_spec.rb
+7
-8
No files found.
app/models/event.rb
View file @
6abc6495
...
@@ -110,14 +110,15 @@ end
...
@@ -110,14 +110,15 @@ end
#
#
# Table name: events
# Table name: events
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# target_type :string(255)
# target_type :string(255)
# target_id :integer
# target_id :integer
(4)
# title :string(255)
# title :string(255)
# data :text
# data :text
# project_id :integer
# project_id :integer
(4)
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# action :integer
# action :integer(4)
# author_id :integer(4)
#
#
app/models/issue.rb
View file @
6abc6495
...
@@ -72,17 +72,18 @@ end
...
@@ -72,17 +72,18 @@ end
#
#
# Table name: issues
# Table name: issues
#
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# title :string(255)
# title :string(255)
# description :text
# assignee_id :integer(4)
# assignee_id :integer
# author_id :integer(4)
# author_id :integer
# project_id :integer(4)
# project_id :integer
# created_at :datetime not null
# created_at :datetime
# updated_at :datetime not null
# updated_at :datetime
# closed :boolean(1) default(FALSE), not null
# closed :boolean default(FALSE), not null
# position :integer(4) default(0)
# position :integer default(0)
# critical :boolean(1) default(FALSE), not null
# critical :boolean default(FALSE), not null
# branch_name :string(255)
# branch_name :string(255)
# description :text
# milestone_id :integer(4)
#
#
app/models/key.rb
View file @
6abc6495
...
@@ -55,13 +55,13 @@ end
...
@@ -55,13 +55,13 @@ end
#
#
# Table name: keys
# Table name: keys
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# user_id :integer
# user_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# key :text
# key :text
# title :string(255)
# title :string(255)
# identifier :string(255)
# identifier :string(255)
# project_id :integer
# project_id :integer
(4)
#
#
app/models/merge_request.rb
View file @
6abc6495
...
@@ -198,15 +198,19 @@ end
...
@@ -198,15 +198,19 @@ end
#
#
# Table name: merge_requests
# Table name: merge_requests
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# target_branch :string(255) not null
# target_branch :string(255) not null
# source_branch :string(255) not null
# source_branch :string(255) not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# author_id :integer
# author_id :integer
(4)
# assignee_id :integer
# assignee_id :integer
(4)
# title :string(255)
# title :string(255)
# closed :boolean default(FALSE), not null
# closed :boolean(1) default(FALSE), not null
# created_at :datetime
# created_at :datetime not null
# updated_at :datetime
# updated_at :datetime not null
# st_commits :text(2147483647
# st_diffs :text(2147483647
# merged :boolean(1) default(FALSE), not null
# state :integer(4) default(1), not null
#
#
app/models/milestone.rb
View file @
6abc6495
# == Schema Information
#
# Table name: milestones
#
# id :integer(4) not null, primary key
# title :string(255) not null
# project_id :integer(4) not null
# description :text
# due_date :date
# closed :boolean(1) default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
#
class
Milestone
<
ActiveRecord
::
Base
class
Milestone
<
ActiveRecord
::
Base
belongs_to
:project
belongs_to
:project
has_many
:issues
has_many
:issues
...
...
app/models/note.rb
View file @
6abc6495
...
@@ -110,14 +110,14 @@ end
...
@@ -110,14 +110,14 @@ end
#
#
# Table name: notes
# Table name: notes
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# note :text
# note :text
# noteable_id :string(255)
# noteable_id :string(255)
# noteable_type :string(255)
# noteable_type :string(255)
# author_id :integer
# author_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# project_id :integer
# project_id :integer
(4)
# attachment :string(255)
# attachment :string(255)
# line_code :string(255)
# line_code :string(255)
#
#
...
...
app/models/project.rb
View file @
6abc6495
...
@@ -161,19 +161,19 @@ end
...
@@ -161,19 +161,19 @@ end
#
#
# Table name: projects
# Table name: projects
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# name :string(255)
# name :string(255)
# path :string(255)
# path :string(255)
# description :text
# description :text
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# private_flag :boolean
default(TRUE), not null
# private_flag :boolean
(1)
default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
# owner_id :integer
(4)
# default_branch :string(255) default("master"), not null
# default_branch :string(255) default("master"), not null
# issues_enabled :boolean
default(TRUE), not null
# issues_enabled :boolean
(1)
default(TRUE), not null
# wall_enabled :boolean
default(TRUE), not null
# wall_enabled :boolean
(1)
default(TRUE), not null
# merge_requests_enabled :boolean
default(TRUE), not null
# merge_requests_enabled :boolean
(1)
default(TRUE), not null
# wiki_enabled :boolean
default(TRUE), not null
# wiki_enabled :boolean
(1)
default(TRUE), not null
#
#
app/models/protected_branch.rb
View file @
6abc6495
...
@@ -18,8 +18,8 @@ end
...
@@ -18,8 +18,8 @@ end
#
#
# Table name: protected_branches
# Table name: protected_branches
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# project_id :integer
not null
# project_id :integer
(4)
not null
# name :string(255) not null
# name :string(255) not null
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
...
...
app/models/snippet.rb
View file @
6abc6495
...
@@ -62,13 +62,13 @@ end
...
@@ -62,13 +62,13 @@ end
#
#
# Table name: snippets
# Table name: snippets
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# title :string(255)
# title :string(255)
# content :text
# content :text
# author_id :integer
not null
# author_id :integer
(4)
not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# file_name :string(255)
# file_name :string(255)
# expires_at :datetime
# expires_at :datetime
#
#
...
...
app/models/user.rb
View file @
6abc6495
...
@@ -92,25 +92,29 @@ end
...
@@ -92,25 +92,29 @@ end
#
#
# Table name: users
# Table name: users
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# email :string(255) default(""), not null
# email :string(255) default(""), not null
# encrypted_password :string(128) default(""), not null
# encrypted_password :string(128) default(""), not null
# reset_password_token :string(255)
# reset_password_token :string(255)
# reset_password_sent_at :datetime
# reset_password_sent_at :datetime
# remember_created_at :datetime
# remember_created_at :datetime
# sign_in_count :integer
default(0)
# sign_in_count :integer
(4)
default(0)
# current_sign_in_at :datetime
# current_sign_in_at :datetime
# last_sign_in_at :datetime
# last_sign_in_at :datetime
# current_sign_in_ip :string(255)
# current_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# name :string(255)
# name :string(255)
# admin :boolean
default(FALSE), not null
# admin :boolean
(1)
default(FALSE), not null
# projects_limit :integer
default(10)
# projects_limit :integer
(4)
default(10)
# skype :string(255) default(""), not null
# skype :string(255) default(""), not null
# linkedin :string(255) default(""), not null
# linkedin :string(255) default(""), not null
# twitter :string(255) default(""), not null
# twitter :string(255) default(""), not null
# authentication_token :string(255)
# authentication_token :string(255)
# dark_scheme :boolean default(FALSE), not null
# dark_scheme :boolean(1) default(FALSE), not null
# theme_id :integer(4) default(1), not null
# bio :string(255)
# blocked :boolean(1) default(FALSE), not null
#
#
app/models/users_project.rb
View file @
6abc6495
...
@@ -75,11 +75,11 @@ end
...
@@ -75,11 +75,11 @@ end
#
#
# Table name: users_projects
# Table name: users_projects
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# user_id :integer
not null
# user_id :integer
(4)
not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# project_access :integer
default(0), not null
# project_access :integer
(4)
default(0), not null
#
#
app/models/web_hook.rb
View file @
6abc6495
...
@@ -22,10 +22,10 @@ end
...
@@ -22,10 +22,10 @@ end
#
#
# Table name: web_hooks
# Table name: web_hooks
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# url :string(255)
# url :string(255)
# project_id :integer
# project_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
#
#
app/models/wiki.rb
View file @
6abc6495
...
@@ -34,13 +34,13 @@ end
...
@@ -34,13 +34,13 @@ end
#
#
# Table name: wikis
# Table name: wikis
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# title :string(255)
# title :string(255)
# content :text
# content :text
# project_id :integer
# project_id :integer
(4)
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# slug :string(255)
# slug :string(255)
# user_id :integer
# user_id :integer
(4)
#
#
spec/models/event_spec.rb
View file @
6abc6495
...
@@ -2,15 +2,16 @@
...
@@ -2,15 +2,16 @@
#
#
# Table name: events
# Table name: events
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# target_type :string(255)
# target_type :string(255)
# target_id :integer
# target_id :integer
(4)
# title :string(255)
# title :string(255)
# data :text
# data :text
# project_id :integer
# project_id :integer
(4)
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
# action :integer
# action :integer(4)
# author_id :integer(4)
#
#
require
'spec_helper'
require
'spec_helper'
...
...
spec/models/issue_spec.rb
View file @
6abc6495
...
@@ -112,16 +112,18 @@ end
...
@@ -112,16 +112,18 @@ end
#
#
# Table name: issues
# Table name: issues
#
#
# id :integer not null, primary key
# id :integer(4) not null, primary key
# title :string(255)
# title :string(255)
# assignee_id :integer
# assignee_id :integer(4)
# author_id :integer
# author_id :integer(4)
# project_id :integer
# project_id :integer(4)
# created_at :datetime
# created_at :datetime not null
# updated_at :datetime
# updated_at :datetime not null
# closed :boolean default(FALSE), not null
# closed :boolean(1) default(FALSE), not null
# position :integer default(0)
# position :integer(4) default(0)
# critical :boolean default(FALSE), not null
# critical :boolean(1) default(FALSE), not null
# branch_name :string(255)
# branch_name :string(255)
# description :text
# milestone_id :integer(4)
#
#
spec/models/key_spec.rb
View file @
6abc6495
...
@@ -53,13 +53,13 @@ end
...
@@ -53,13 +53,13 @@ end
#
#
# Table name: keys
# Table name: keys
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# user_id :integer
# user_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# key :text
# key :text
# title :string(255)
# title :string(255)
# identifier :string(255)
# identifier :string(255)
# project_id :integer
# project_id :integer
(4)
#
#
spec/models/merge_request_spec.rb
View file @
6abc6495
...
@@ -62,15 +62,19 @@ end
...
@@ -62,15 +62,19 @@ end
#
#
# Table name: merge_requests
# Table name: merge_requests
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# target_branch :string(255) not null
# target_branch :string(255) not null
# source_branch :string(255) not null
# source_branch :string(255) not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# author_id :integer
# author_id :integer
(4)
# assignee_id :integer
# assignee_id :integer
(4)
# title :string(255)
# title :string(255)
# closed :boolean default(FALSE), not null
# closed :boolean(1) default(FALSE), not null
# created_at :datetime
# created_at :datetime not null
# updated_at :datetime
# updated_at :datetime not null
# st_commits :text(2147483647
# st_diffs :text(2147483647
# merged :boolean(1) default(FALSE), not null
# state :integer(4) default(1), not null
#
#
spec/models/milestone_spec.rb
View file @
6abc6495
# == Schema Information
#
# Table name: milestones
#
# id :integer(4) not null, primary key
# title :string(255) not null
# project_id :integer(4) not null
# description :text
# due_date :date
# closed :boolean(1) default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
#
require
'spec_helper'
require
'spec_helper'
describe
Milestone
do
describe
Milestone
do
...
...
spec/models/note_spec.rb
View file @
6abc6495
...
@@ -139,14 +139,14 @@ end
...
@@ -139,14 +139,14 @@ end
#
#
# Table name: notes
# Table name: notes
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# note :text
# note :text
# noteable_id :string(255)
# noteable_id :string(255)
# noteable_type :string(255)
# noteable_type :string(255)
# author_id :integer
# author_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# project_id :integer
# project_id :integer
(4)
# attachment :string(255)
# attachment :string(255)
# line_code :string(255)
# line_code :string(255)
#
#
...
...
spec/models/project_spec.rb
View file @
6abc6495
...
@@ -206,19 +206,19 @@ end
...
@@ -206,19 +206,19 @@ end
#
#
# Table name: projects
# Table name: projects
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# name :string(255)
# name :string(255)
# path :string(255)
# path :string(255)
# description :text
# description :text
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# private_flag :boolean
default(TRUE), not null
# private_flag :boolean
(1)
default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
# owner_id :integer
(4)
# default_branch :string(255) default("master"), not null
# default_branch :string(255) default("master"), not null
# issues_enabled :boolean
default(TRUE), not null
# issues_enabled :boolean
(1)
default(TRUE), not null
# wall_enabled :boolean
default(TRUE), not null
# wall_enabled :boolean
(1)
default(TRUE), not null
# merge_requests_enabled :boolean
default(TRUE), not null
# merge_requests_enabled :boolean
(1)
default(TRUE), not null
# wiki_enabled :boolean
default(TRUE), not null
# wiki_enabled :boolean
(1)
default(TRUE), not null
#
#
spec/models/protected_branch_spec.rb
View file @
6abc6495
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
#
#
# Table name: protected_branches
# Table name: protected_branches
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# project_id :integer
not null
# project_id :integer
(4)
not null
# name :string(255) not null
# name :string(255) not null
# created_at :datetime not null
# created_at :datetime not null
# updated_at :datetime not null
# updated_at :datetime not null
...
...
spec/models/snippet_spec.rb
View file @
6abc6495
...
@@ -18,13 +18,13 @@ end
...
@@ -18,13 +18,13 @@ end
#
#
# Table name: snippets
# Table name: snippets
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# title :string(255)
# title :string(255)
# content :text
# content :text
# author_id :integer
not null
# author_id :integer
(4)
not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# file_name :string(255)
# file_name :string(255)
# expires_at :datetime
# expires_at :datetime
#
#
...
...
spec/models/user_spec.rb
View file @
6abc6495
...
@@ -46,25 +46,29 @@ end
...
@@ -46,25 +46,29 @@ end
#
#
# Table name: users
# Table name: users
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# email :string(255) default(""), not null
# email :string(255) default(""), not null
# encrypted_password :string(128) default(""), not null
# encrypted_password :string(128) default(""), not null
# reset_password_token :string(255)
# reset_password_token :string(255)
# reset_password_sent_at :datetime
# reset_password_sent_at :datetime
# remember_created_at :datetime
# remember_created_at :datetime
# sign_in_count :integer
default(0)
# sign_in_count :integer
(4)
default(0)
# current_sign_in_at :datetime
# current_sign_in_at :datetime
# last_sign_in_at :datetime
# last_sign_in_at :datetime
# current_sign_in_ip :string(255)
# current_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# name :string(255)
# name :string(255)
# admin :boolean
default(FALSE), not null
# admin :boolean
(1)
default(FALSE), not null
# projects_limit :integer
default(10)
# projects_limit :integer
(4)
default(10)
# skype :string(255) default(""), not null
# skype :string(255) default(""), not null
# linkedin :string(255) default(""), not null
# linkedin :string(255) default(""), not null
# twitter :string(255) default(""), not null
# twitter :string(255) default(""), not null
# authentication_token :string(255)
# authentication_token :string(255)
# dark_scheme :boolean default(FALSE), not null
# dark_scheme :boolean(1) default(FALSE), not null
# theme_id :integer(4) default(1), not null
# bio :string(255)
# blocked :boolean(1) default(FALSE), not null
#
#
spec/models/users_project_spec.rb
View file @
6abc6495
...
@@ -20,11 +20,11 @@ end
...
@@ -20,11 +20,11 @@ end
#
#
# Table name: users_projects
# Table name: users_projects
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# user_id :integer
not null
# user_id :integer
(4)
not null
# project_id :integer
not null
# project_id :integer
(4)
not null
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
# project_access :integer
default(0), not null
# project_access :integer
(4)
default(0), not null
#
#
spec/models/web_hook_spec.rb
View file @
6abc6495
...
@@ -56,10 +56,10 @@ end
...
@@ -56,10 +56,10 @@ end
#
#
# Table name: web_hooks
# Table name: web_hooks
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# url :string(255)
# url :string(255)
# project_id :integer
# project_id :integer
(4)
# created_at :datetime
# created_at :datetime
not null
# updated_at :datetime
# updated_at :datetime
not null
#
#
spec/models/wiki_spec.rb
View file @
6abc6495
...
@@ -16,16 +16,15 @@ describe Wiki do
...
@@ -16,16 +16,15 @@ describe Wiki do
end
end
# == Schema Information
# == Schema Information
#
#
# Table name:
snippet
s
# Table name:
wiki
s
#
#
# id :integer
not null, primary key
# id :integer
(4)
not null, primary key
# title :string(255)
# title :string(255)
# content :text
# content :text
# author_id :integer not null
# project_id :integer(4)
# project_id :integer not null
# created_at :datetime not null
# created_at :datetime
# updated_at :datetime not null
# updated_at :datetime
# slug :string(255)
# file_name :string(255)
# user_id :integer(4)
# expires_at :datetime
#
#
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