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
76a07394
Commit
76a07394
authored
Sep 09, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add description to MergeRequest model
parent
b349af20
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
4 deletions
+10
-4
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+2
-0
app/models/issue.rb
app/models/issue.rb
+0
-1
app/models/merge_request.rb
app/models/merge_request.rb
+1
-2
db/migrate/20130909132950_add_description_to_merge_request.rb
...igrate/20130909132950_add_description_to_merge_request.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
No files found.
app/models/concerns/issuable.rb
View file @
76a07394
...
@@ -37,6 +37,8 @@ module Issuable
...
@@ -37,6 +37,8 @@ module Issuable
prefix:
true
prefix:
true
attr_accessor
:author_id_of_changes
attr_accessor
:author_id_of_changes
attr_mentionable
:title
,
:description
end
end
module
ClassMethods
module
ClassMethods
...
...
app/models/issue.rb
View file @
76a07394
...
@@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base
...
@@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base
attr_accessible
:title
,
:assignee_id
,
:position
,
:description
,
attr_accessible
:title
,
:assignee_id
,
:position
,
:description
,
:milestone_id
,
:label_list
,
:author_id_of_changes
,
:milestone_id
,
:label_list
,
:author_id_of_changes
,
:state_event
:state_event
attr_mentionable
:title
,
:description
acts_as_taggable_on
:labels
acts_as_taggable_on
:labels
...
...
app/models/merge_request.rb
View file @
76a07394
...
@@ -30,8 +30,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -30,8 +30,7 @@ class MergeRequest < ActiveRecord::Base
belongs_to
:target_project
,
foreign_key: :target_project_id
,
class_name:
"Project"
belongs_to
:target_project
,
foreign_key: :target_project_id
,
class_name:
"Project"
belongs_to
:source_project
,
foreign_key: :source_project_id
,
class_name:
"Project"
belongs_to
:source_project
,
foreign_key: :source_project_id
,
class_name:
"Project"
attr_accessible
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:author_id_of_changes
,
:state_event
attr_accessible
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:author_id_of_changes
,
:state_event
,
:description
attr_mentionable
:title
attr_accessor
:should_remove_source_branch
attr_accessor
:should_remove_source_branch
...
...
db/migrate/20130909132950_add_description_to_merge_request.rb
0 → 100644
View file @
76a07394
class
AddDescriptionToMergeRequest
<
ActiveRecord
::
Migration
def
change
add_column
:merge_requests
,
:description
,
:text
,
null:
true
end
end
db/schema.rb
View file @
76a07394
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended to check this file into your version control system.
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
20130
821090531
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
20130
909132950
)
do
create_table
"deploy_keys_projects"
,
:force
=>
true
do
|
t
|
create_table
"deploy_keys_projects"
,
:force
=>
true
do
|
t
|
t
.
integer
"deploy_key_id"
,
:null
=>
false
t
.
integer
"deploy_key_id"
,
:null
=>
false
...
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version => 20130821090531) do
...
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version => 20130821090531) do
t
.
string
"merge_status"
t
.
string
"merge_status"
t
.
integer
"target_project_id"
,
:null
=>
false
t
.
integer
"target_project_id"
,
:null
=>
false
t
.
integer
"iid"
t
.
integer
"iid"
t
.
text
"description"
end
end
add_index
"merge_requests"
,
[
"assignee_id"
],
:name
=>
"index_merge_requests_on_assignee_id"
add_index
"merge_requests"
,
[
"assignee_id"
],
:name
=>
"index_merge_requests_on_assignee_id"
...
...
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