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
a66d9b4c
Commit
a66d9b4c
authored
Dec 18, 2011
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
annotate model
parent
32aa2e3f
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
68 additions
and
34 deletions
+68
-34
app/models/issue.rb
app/models/issue.rb
+1
-0
app/models/merge_request.rb
app/models/merge_request.rb
+16
-0
app/models/project.rb
app/models/project.rb
+10
-9
app/models/users_project.rb
app/models/users_project.rb
+7
-8
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+1
-0
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+16
-0
spec/models/project_spec.rb
spec/models/project_spec.rb
+10
-9
spec/models/users_project_spec.rb
spec/models/users_project_spec.rb
+7
-8
No files found.
app/models/issue.rb
View file @
a66d9b4c
...
@@ -59,5 +59,6 @@ end
...
@@ -59,5 +59,6 @@ end
# closed :boolean default(FALSE), not null
# closed :boolean default(FALSE), not null
# position :integer default(0)
# position :integer default(0)
# critical :boolean default(FALSE), not null
# critical :boolean default(FALSE), not null
# branch_name :string(255)
#
#
app/models/merge_request.rb
View file @
a66d9b4c
...
@@ -44,3 +44,19 @@ class MergeRequest < ActiveRecord::Base
...
@@ -44,3 +44,19 @@ class MergeRequest < ActiveRecord::Base
project
.
commit
(
source_branch
)
project
.
commit
(
source_branch
)
end
end
end
end
# == Schema Information
#
# Table name: merge_requests
#
# id :integer not null, primary key
# target_branch :string(255) not null
# source_branch :string(255) not null
# project_id :integer not null
# author_id :integer
# assignee_id :integer
# title :string(255)
# closed :boolean default(FALSE), not null
# created_at :datetime
# updated_at :datetime
#
app/models/project.rb
View file @
a66d9b4c
...
@@ -256,5 +256,6 @@ end
...
@@ -256,5 +256,6 @@ end
# private_flag :boolean default(TRUE), not null
# private_flag :boolean default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
# owner_id :integer
# default_branch :string(255) default("master"), not null
#
#
app/models/users_project.rb
View file @
a66d9b4c
...
@@ -26,10 +26,9 @@ end
...
@@ -26,10 +26,9 @@ end
# id :integer not null, primary key
# id :integer not null, primary key
# user_id :integer not null
# user_id :integer not null
# project_id :integer not null
# project_id :integer not null
# read :boolean default(FALSE)
# write :boolean default(FALSE)
# admin :boolean default(FALSE)
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# repo_access :integer default(0), not null
# project_access :integer default(0), not null
#
#
spec/models/issue_spec.rb
View file @
a66d9b4c
...
@@ -39,5 +39,6 @@ end
...
@@ -39,5 +39,6 @@ end
# closed :boolean default(FALSE), not null
# closed :boolean default(FALSE), not null
# position :integer default(0)
# position :integer default(0)
# critical :boolean default(FALSE), not null
# critical :boolean default(FALSE), not null
# branch_name :string(255)
#
#
spec/models/merge_request_spec.rb
View file @
a66d9b4c
...
@@ -26,3 +26,19 @@ describe MergeRequest do
...
@@ -26,3 +26,19 @@ describe MergeRequest do
:assignee
=>
Factory
(
:user
),
:assignee
=>
Factory
(
:user
),
:project
=>
Factory
.
create
(
:project
)).
should
be_valid
}
:project
=>
Factory
.
create
(
:project
)).
should
be_valid
}
end
end
# == Schema Information
#
# Table name: merge_requests
#
# id :integer not null, primary key
# target_branch :string(255) not null
# source_branch :string(255) not null
# project_id :integer not null
# author_id :integer
# assignee_id :integer
# title :string(255)
# closed :boolean default(FALSE), not null
# created_at :datetime
# updated_at :datetime
#
spec/models/project_spec.rb
View file @
a66d9b4c
...
@@ -177,5 +177,6 @@ end
...
@@ -177,5 +177,6 @@ end
# private_flag :boolean default(TRUE), not null
# private_flag :boolean default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
# owner_id :integer
# default_branch :string(255) default("master"), not null
#
#
spec/models/users_project_spec.rb
View file @
a66d9b4c
...
@@ -23,10 +23,9 @@ end
...
@@ -23,10 +23,9 @@ end
# id :integer not null, primary key
# id :integer not null, primary key
# user_id :integer not null
# user_id :integer not null
# project_id :integer not null
# project_id :integer not null
# read :boolean default(FALSE)
# write :boolean default(FALSE)
# admin :boolean default(FALSE)
# created_at :datetime
# created_at :datetime
# updated_at :datetime
# updated_at :datetime
# repo_access :integer default(0), not null
# project_access :integer default(0), not null
#
#
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