diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 00:55:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 00:55:06 +0000 |
| commit | d0e11f37e33f6c223e6c845af9984506bcda4038 (patch) | |
| tree | 0d4a94078e4d0aa954a80be381e7397902b661cb | |
| parent | bba142230905e38cd219af3fc35ae663168e405a (diff) | |
| parent | 5f40253f7696e920614328246120805fbf79d97c (diff) | |
| download | gitlab-ce-d0e11f37e33f6c223e6c845af9984506bcda4038.tar.gz | |
Merge branch 'reduce-notice-count' into 'master'
Remove annoying notice messages when create/update merge request
See merge request !1681
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 8 |
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: { |