Download as
Browse Code »

Commit 76a07394547a8df1ac1553ecd52f3e6e2d20a8af

Authored by Dmitriy Zaporozhets
1 parent b349af20
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Add description to MergeRequest model

Showing 5 changed files with 10 additions and 4 deletions   Show diff stats
app/models/concerns/issuable.rb
  Diff comments   View file @76a0739
@@ -37,6 +37,8 @@ module Issuable @@ -37,6 +37,8 @@ module Issuable
37 prefix: true 37 prefix: true
38 38
39 attr_accessor :author_id_of_changes 39 attr_accessor :author_id_of_changes
  40 +
  41 + attr_mentionable :title, :description
40 end 42 end
41 43
42 module ClassMethods 44 module ClassMethods
app/models/issue.rb
  Diff comments   View file @76a0739
@@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base @@ -32,7 +32,6 @@ class Issue < ActiveRecord::Base
32 attr_accessible :title, :assignee_id, :position, :description, 32 attr_accessible :title, :assignee_id, :position, :description,
33 :milestone_id, :label_list, :author_id_of_changes, 33 :milestone_id, :label_list, :author_id_of_changes,
34 :state_event 34 :state_event
35 - attr_mentionable :title, :description  
36 35
37 acts_as_taggable_on :labels 36 acts_as_taggable_on :labels
38 37
app/models/merge_request.rb
  Diff comments   View file @76a0739
@@ -30,8 +30,7 @@ class MergeRequest < ActiveRecord::Base @@ -30,8 +30,7 @@ class MergeRequest < ActiveRecord::Base
30 belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project" 30 belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
31 belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project" 31 belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
32 32
33 - attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event  
34 - attr_mentionable :title 33 + attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description
35 34
36 attr_accessor :should_remove_source_branch 35 attr_accessor :should_remove_source_branch
37 36
db/migrate/20130909132950_add_description_to_merge_request.rb 0 → 100644
  Diff comments   View file @76a0739
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class AddDescriptionToMergeRequest < ActiveRecord::Migration
  2 + def change
  3 + add_column :merge_requests, :description, :text, null: true
  4 + end
  5 +end
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # 11 #
12 # It's strongly recommended to check this file into your version control system. 12 # It's strongly recommended to check this file into your version control system.
13 13
14 -ActiveRecord::Schema.define(:version => 20130821090531) do 14 +ActiveRecord::Schema.define(:version => 20130909132950) do
15 15
16 create_table "deploy_keys_projects", :force => true do |t| 16 create_table "deploy_keys_projects", :force => true do |t|
17 t.integer "deploy_key_id", :null => false 17 t.integer "deploy_key_id", :null => false
@@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130821090531) do @@ -100,6 +100,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130821090531) do
100 t.string "merge_status" 100 t.string "merge_status"
101 t.integer "target_project_id", :null => false 101 t.integer "target_project_id", :null => false
102 t.integer "iid" 102 t.integer "iid"
  103 + t.text "description"
103 end 104 end
104 105
105 add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" 106 add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id"