Commit 9ad5d9a4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/mr_description' of /home/git/repositories/gitlab/gitlabhq

parents 1f81c008 e0ca2ada
...@@ -18,6 +18,8 @@ class Dispatcher ...@@ -18,6 +18,8 @@ class Dispatcher
switch page switch page
when 'projects:issues:index' when 'projects:issues:index'
Issues.init() Issues.init()
when 'projects:issues:new', 'projects:merge_requests:new'
GitLab.GfmAutoComplete.setup()
when 'dashboard:show' when 'dashboard:show'
new Dashboard() new Dashboard()
new Activities() new Activities()
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.merge-request-angle { .merge-request-angle {
text-align: center; text-align: center;
margin-top: 45px; margin: 0;
} }
.merge-request-form-info { .merge-request-form-info {
......
...@@ -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
......
...@@ -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
......
...@@ -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
......
...@@ -5,41 +5,32 @@ ...@@ -5,41 +5,32 @@
- @merge_request.errors.full_messages.each do |msg| - @merge_request.errors.full_messages.each do |msg|
%li= msg %li= msg
%h3.page-title
Branches
.merge-request-branches .merge-request-branches
.row .row
.span5 .span5
.ui-box .clearfix
.title From .pull-left
.ui-box-head = f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span3'})
Project: .pull-left
= f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'}) &nbsp;
.prepend-top-10
%i.icon-code-fork %i.icon-code-fork
Branch: = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'})
= f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span3'})
.mr_source_commit.prepend-top-10 .mr_source_commit.prepend-top-10
.span2 .span2
%h1.merge-request-angle %h2.merge-request-angle.light
%i.icon-angle-right %i.icon-long-arrow-right
.span5 .span5
.ui-box .clearfix
.title To .pull-left
.ui-box-head
- projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project] - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
Project: = f.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span3'})
= f.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'}) .pull-left
.prepend-top-10 &nbsp;
%i.icon-code-fork %i.icon-code-fork
Branch: = f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span2'})
= f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span3'})
.mr_target_commit.prepend-top-10 .mr_target_commit.prepend-top-10
%hr %hr
%h3.page-title
Details
.merge-request-form-info .merge-request-form-info
.control-group .control-group
= f.label :title do = f.label :title do
...@@ -56,6 +47,12 @@ ...@@ -56,6 +47,12 @@
%i.icon-time %i.icon-time
Milestone Milestone
.controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'}) .controls= f.select(:milestone_id, @project.milestones.active.all.map {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
.control-group
= f.label :description, "Description"
.controls
= f.text_area :description, class: "input-xxlarge js-gfm-input", rows: 14
%p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.form-actions .form-actions
- if @merge_request.new_record? - if @merge_request.new_record?
......
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
- if @merge_request.description.present?
.ui-box-bottom
.wiki
= preserve do
= markdown @merge_request.description
- if @merge_request.closed? - if @merge_request.closed?
.ui-box-bottom.alert-error .ui-box-bottom.alert-error
%span %span
......
class AddDescriptionToMergeRequest < ActiveRecord::Migration
def change
add_column :merge_requests, :description, :text, null: true
end
end
...@@ -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 => 20130821090531) do ActiveRecord::Schema.define(:version => 20130909132950) 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"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment