Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5f40253f
Commit
5f40253f
authored
Mar 11, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove annoying notice messages when create/update merge request
parent
88e4aed9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
6 deletions
+2
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-6
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
5f40253f
...
@@ -78,10 +78,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -78,10 +78,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request
=
MergeRequests
::
CreateService
.
new
(
project
,
current_user
,
merge_request_params
).
execute
@merge_request
=
MergeRequests
::
CreateService
.
new
(
project
,
current_user
,
merge_request_params
).
execute
if
@merge_request
.
valid?
if
@merge_request
.
valid?
redirect_to
(
redirect_to
(
merge_request_path
(
@merge_request
))
merge_request_path
(
@merge_request
),
notice:
'Merge request was successfully created.'
)
else
else
@source_project
=
@merge_request
.
source_project
@source_project
=
@merge_request
.
source_project
@target_project
=
@merge_request
.
target_project
@target_project
=
@merge_request
.
target_project
...
@@ -97,8 +94,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -97,8 +94,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format
.
js
format
.
js
format
.
html
do
format
.
html
do
redirect_to
([
@merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
redirect_to
([
@merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
@merge_request
.
target_project
,
@merge_request
],
@merge_request
.
target_project
,
@merge_request
])
notice:
'Merge request was successfully updated.'
)
end
end
format
.
json
do
format
.
json
do
render
json:
{
render
json:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment