diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
| commit | cad4eb989e87c2e1ce996cfb5817d2c1729111c8 (patch) | |
| tree | c22d766e5f9dd8a299a3d68cd70f8a04df7e754a /app/views/projects/merge_requests/creations/_new_compare.html.haml | |
| parent | 02579d6aeba3673c950896bdb511df8c678e20ca (diff) | |
| parent | d8dd75ca775f66fd756e43ddd73ac75d39fc3e64 (diff) | |
| download | gitlab-ce-cad4eb989e87c2e1ce996cfb5817d2c1729111c8.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/issues/_nav_btns.html.haml
# app/views/projects/merge_requests/creations/_new_compare.html.haml
Diffstat (limited to 'app/views/projects/merge_requests/creations/_new_compare.html.haml')
| -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 813f8a34f71..73454a91ed8 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| .d-none.alert.alert-danger.mr-compare-errors - .merge-request-branches.js-merge-request-new-compare.row.col-md-12{ '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.col-md-12{ '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.pl-0 .card.card-new-merge-request .card-header |