home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reduce-notice-count' into 'master'

Browse Source 
Remove annoying notice messages when create/update merge request

See merge request !1681
This commit is contained in:
Dmitriy Zaporozhets
2015-03-12 00:55:06 +00:00
parent bba1422309 5f40253f76
commit d0e11f37e3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/projects/merge_requests_controller.rb
+2 -6
View File
@@ -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: {