diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-18 14:49:41 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-18 14:49:41 +0300 |
| commit | 9c2f6e04cf5d2eb89d0ec68e8ace87b3804e9ae5 (patch) | |
| tree | e21371895c94c052a37ffd8946e860783059619a /app/views/projects/merge_requests/creations | |
| parent | d411fb82993d215c2e8790318e2aee9d909c8f9b (diff) | |
| parent | 11108f0ff50769150a0a8d9c7fa89cfc0f54289a (diff) | |
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
Diffstat (limited to 'app/views/projects/merge_requests/creations')
| -rw-r--r-- | app/views/projects/merge_requests/creations/_new_compare.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |