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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
f86afb73
Commit
f86afb73
authored
Jun 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dev env. Fix MR creation
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
cb74c014
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+4
-0
config/environments/development.rb
config/environments/development.rb
+0
-3
config/environments/test.rb
config/environments/test.rb
+0
-3
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
f86afb73
...
@@ -60,6 +60,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -60,6 +60,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
new
def
new
params
[
:merge_request
]
||=
ActionController
::
Parameters
.
new
(
source_project:
@project
)
@merge_request
=
MergeRequest
.
new
(
merge_request_params
)
@merge_request
=
MergeRequest
.
new
(
merge_request_params
)
@merge_request
.
source_project
=
@project
unless
@merge_request
.
source_project
@merge_request
.
source_project
=
@project
unless
@merge_request
.
source_project
@merge_request
.
target_project
||=
(
@project
.
forked_from_project
||
@project
)
@merge_request
.
target_project
||=
(
@project
.
forked_from_project
||
@project
)
...
...
config/environments/development.rb
View file @
f86afb73
...
@@ -19,9 +19,6 @@ Gitlab::Application.configure do
...
@@ -19,9 +19,6 @@ Gitlab::Application.configure do
# Only use best-standards-support built into browsers
# Only use best-standards-support built into browsers
config
.
action_dispatch
.
best_standards_support
=
:builtin
config
.
action_dispatch
.
best_standards_support
=
:builtin
# Raise exception on mass assignment protection for Active Record models
config
.
active_record
.
mass_assignment_sanitizer
=
:strict
# Do not compress assets
# Do not compress assets
config
.
assets
.
compress
=
false
config
.
assets
.
compress
=
false
...
...
config/environments/test.rb
View file @
f86afb73
...
@@ -26,9 +26,6 @@ Gitlab::Application.configure do
...
@@ -26,9 +26,6 @@ Gitlab::Application.configure do
# ActionMailer::Base.deliveries array.
# ActionMailer::Base.deliveries array.
config
.
action_mailer
.
delivery_method
=
:test
config
.
action_mailer
.
delivery_method
=
:test
# Raise exception on mass assignment protection for Active Record models
# config.active_record.mass_assignment_sanitizer = :strict
# Print deprecation notices to the stderr
# Print deprecation notices to the stderr
config
.
active_support
.
deprecation
=
:stderr
config
.
active_support
.
deprecation
=
:stderr
...
...
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