diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-18 11:49:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-20 10:16:51 +0100 |
| commit | 1e380685de3fdcb74566d6675c163f4c18ea02b9 (patch) | |
| tree | 4809183b99f5969f72b08f9856604e03d8fa1f5a | |
| parent | bb37a646129b527327ef1f640c751dc0a74a7e94 (diff) | |
| download | gitlab-ce-1e380685de3fdcb74566d6675c163f4c18ea02b9.tar.gz | |
Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'
Fix regression around new SHA widget in "New Merge Request" Screen
Closes #45446
See merge request gitlab-org/gitlab-ce!18422
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_compare.html.haml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 86cdda0359e..e9384d41e00 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -180,10 +180,6 @@ justify-content: space-between; align-items: center; flex-grow: 1; - - .merge-request-branches & { - flex-direction: column; - } } .commit-content { diff --git a/app/views/projects/merge_requests/creations/_new_compare.html.haml b/app/views/projects/merge_requests/creations/_new_compare.html.haml index 9d5cebdda53..f81db9b4e28 100644 --- a/app/views/projects/merge_requests/creations/_new_compare.html.haml +++ b/app/views/projects/merge_requests/creations/_new_compare.html.haml @@ -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| .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 .panel.panel-default.panel-new-merge-request .panel-heading |