summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-25 06:16:40 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-08-25 06:16:40 -0700
commit8d65f51e635ae84dd19b361a2cf9fb1ef2c2014b (patch)
tree9a669f82b301847d17bc631cf779f6406f411a2e
parentdf2433db54bad8e2963d373e076ce642f0093aad (diff)
parent2b38f51a17464537b9e4110917868bc9c1b1950a (diff)
downloadgitlab-ce-8d65f51e635ae84dd19b361a2cf9fb1ef2c2014b.tar.gz
Merge pull request #1295 from jouve/fix_mr_form
fix merge request form
-rw-r--r--app/controllers/merge_requests_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb
index 4938a294f60..187bb407b2d 100644
--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -103,10 +103,12 @@ class MergeRequestsController < ApplicationController
def branch_from
@commit = project.commit(params[:ref])
+ @commit = CommitDecorator.decorate(@commit)
end
def branch_to
@commit = project.commit(params[:ref])
+ @commit = CommitDecorator.decorate(@commit)
end
protected