Removed issues,mr delete buttons. Refactored models
This commit is contained in:
parent
3fe9d2972f
commit
0727edd8a0
13 changed files with 82 additions and 186 deletions
|
@ -5,6 +5,9 @@
|
|||
- @merge_request.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.clearfix
|
||||
= f.label :title
|
||||
.input= f.text_area :title, :class => "xxlarge", :maxlength => 255, :rows => 5
|
||||
.clearfix
|
||||
= f.label :source_branch, "From"
|
||||
.input= f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
|
||||
|
@ -15,9 +18,6 @@
|
|||
= f.label :assignee_id, "Assign to"
|
||||
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
|
||||
|
||||
.clearfix
|
||||
= f.label :title
|
||||
.input= f.text_area :title, :class => "xlarge", :maxlength => 255, :rows => 5
|
||||
.actions
|
||||
= f.submit 'Save', :class => "primary btn"
|
||||
- if @merge_request.new_record?
|
||||
|
@ -26,11 +26,6 @@
|
|||
- else
|
||||
= link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
|
||||
Cancel
|
||||
|
||||
- unless @merge_request.new_record?
|
||||
.right
|
||||
= link_to 'Remove', [@project, @merge_request], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue