summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-11 18:02:37 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-11 18:02:37 -0700
commitc02d891cb5f1c1df8fb69da31c901abcc4511f5b (patch)
tree9ab9c86c3711a673ce7c9916e041d2c9c210023b /app/controllers
parentd6dda952b8eea8f6b08df9a4d12e5991929de3d4 (diff)
parentf186b20cb2e5fa59c1b7b6ac9c56141327c89e47 (diff)
downloadgitlab-ce-c02d891cb5f1c1df8fb69da31c901abcc4511f5b.tar.gz
Merge branch 'master' into new-emoji
Conflicts: Gemfile.lock
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 848cf367493..57c017e799f 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -78,10 +78,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
if @merge_request.valid?
- redirect_to(
- merge_request_path(@merge_request),
- notice: 'Merge request was successfully created.'
- )
+ redirect_to(merge_request_path(@merge_request))
else
@source_project = @merge_request.source_project
@target_project = @merge_request.target_project
@@ -97,8 +94,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format.js
format.html do
redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
- @merge_request.target_project, @merge_request],
- notice: 'Merge request was successfully updated.')
+ @merge_request.target_project, @merge_request])
end
format.json do
render json: {