diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-14 14:58:24 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-14 14:58:24 +0000 |
commit | 81c64980af6aead6abe13ba35dc678069fc5c8e8 (patch) | |
tree | 1cda1df031bb2782d5b237e77b8583bbc572eb8a | |
parent | ea891fb3ad930a5df1f0021ef1513098de86545b (diff) | |
parent | 10002088e2aa27255bcdea2941cf484d7926129f (diff) | |
download | gitlab-ce-81c64980af6aead6abe13ba35dc678069fc5c8e8.tar.gz |
Merge branch '47871-new-mr-tab-active-state' into 'master'
Resolve "Tab active state is not changing correctly on new merge request page"
Closes #47871
See merge request gitlab-org/gitlab-ce!19781
-rw-r--r-- | app/views/projects/merge_requests/creations/_new_submit.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/47871-new-mr-tab-active-state.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml index ebcd99f2a9b..b2eacabc21a 100644 --- a/app/views/projects/merge_requests/creations/_new_submit.html.haml +++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml @@ -25,7 +25,7 @@ = custom_icon ('illustration_no_commits') - else %ul.merge-request-tabs.nav.nav-tabs.nav-links.no-top.no-bottom - %li.commits-tab.active + %li.commits-tab = link_to url_for(safe_params), data: {target: 'div#commits', action: 'new', toggle: 'tab'} do Commits %span.badge.badge-pill= @commits.size diff --git a/changelogs/unreleased/47871-new-mr-tab-active-state.yml b/changelogs/unreleased/47871-new-mr-tab-active-state.yml new file mode 100644 index 00000000000..c3fc8672d82 --- /dev/null +++ b/changelogs/unreleased/47871-new-mr-tab-active-state.yml @@ -0,0 +1,5 @@ +--- +title: Fix active tab highlight when creating new merge request +merge_request: 19781 +author: Jan Beckmann +type: fixed |