Commit f158a447 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ee-45446-new-sha-widget-breaks-on-new-merge-request' into 'master'

EE Port of CE!18422

See merge request gitlab-org/gitlab-ee!5402
parents 03bde5ab badf7343
...@@ -181,10 +181,6 @@ ...@@ -181,10 +181,6 @@
align-items: center; align-items: center;
flex-grow: 1; flex-grow: 1;
.merge-request-branches & {
flex-direction: column;
}
.project_namespace { .project_namespace {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: project_new_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f| = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: project_new_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f|
.hide.alert.alert-danger.mr-compare-errors .hide.alert.alert-danger.mr-compare-errors
.merge-request-branches.js-merge-request-new-compare.row{ 'data-target-project-url': project_new_merge_request_update_branches_path(@source_project), 'data-source-branch-url': project_new_merge_request_branch_from_path(@source_project), 'data-target-branch-url': project_new_merge_request_branch_to_path(@source_project) } .js-merge-request-new-compare.row{ 'data-target-project-url': project_new_merge_request_update_branches_path(@source_project), 'data-source-branch-url': project_new_merge_request_branch_from_path(@source_project), 'data-target-branch-url': project_new_merge_request_branch_to_path(@source_project) }
.col-md-6 .col-md-6
.panel.panel-default.panel-new-merge-request .panel.panel-default.panel-new-merge-request
.panel-heading .panel-heading
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment