Skip to content
Snippets Groups Projects
Commit 7a7494d3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Wes Gurney
Browse files

Add description to MergeRequest model

parent 7e783906
No related branches found
No related tags found
1 merge request!4954Add support to configure webhook_timeout in gitlab.yaml
Loading
Loading
@@ -37,6 +37,8 @@ module Issuable
prefix: true
 
attr_accessor :author_id_of_changes
attr_mentionable :title, :description
end
 
module ClassMethods
Loading
Loading
Loading
Loading
@@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base
attr_accessible :title, :assignee_id, :position, :description,
:milestone_id, :label_list, :author_id_of_changes,
:state_event
attr_mentionable :title, :description
 
acts_as_taggable_on :labels
 
Loading
Loading
Loading
Loading
@@ -30,8 +30,7 @@ class MergeRequest < ActiveRecord::Base
belongs_to :target_project, foreign_key: :target_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_mentionable :title
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_accessor :should_remove_source_branch
 
Loading
Loading
class AddDescriptionToMergeRequest < ActiveRecord::Migration
def change
add_column :merge_requests, :description, :text, null: true
end
end
Loading
Loading
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
 
ActiveRecord::Schema.define(:version => 20130821090531) do
ActiveRecord::Schema.define(:version => 20130909132950) do
 
create_table "deploy_keys_projects", :force => true do |t|
t.integer "deploy_key_id", :null => false
Loading
Loading
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version => 20130821090531) do
t.string "merge_status"
t.integer "target_project_id", :null => false
t.integer "iid"
t.text "description"
end
 
add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment