Skip to content
Snippets Groups Projects
Verified Commit f86afb73 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix dev env. Fix MR creation

parent cb74c014
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -60,6 +60,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
 
def new
params[:merge_request] ||= ActionController::Parameters.new(
source_project: @project
)
@merge_request = MergeRequest.new(merge_request_params)
@merge_request.source_project = @project unless @merge_request.source_project
@merge_request.target_project ||= (@project.forked_from_project || @project)
Loading
Loading
Loading
Loading
@@ -19,9 +19,6 @@ Gitlab::Application.configure do
# Only use best-standards-support built into browsers
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
config.assets.compress = false
 
Loading
Loading
Loading
Loading
@@ -26,9 +26,6 @@ Gitlab::Application.configure do
# ActionMailer::Base.deliveries array.
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
config.active_support.deprecation = :stderr
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment