diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-22 07:54:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-22 07:54:18 +0000 |
| commit | 3ae9b696f60876b398bc150c3ca5e3f0fe0323d0 (patch) | |
| tree | e0429d01a86b95c406f71086a5d7ab834fdc0400 | |
| parent | d7f61affaf845f44b4cc995e34eb1606c47c8eff (diff) | |
| parent | 3ceb888d79165da285799840e292b1e72f372ddd (diff) | |
| download | gitlab-ce-3ae9b696f60876b398bc150c3ca5e3f0fe0323d0.tar.gz | |
Merge branch 'rs-toggle-tab' into 'master'
Fix tab behavior on MergeRequests#new
Missed this one in 269aee790c48619a92f416c8555cb4623da62ca3
Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents.
See merge request !556
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index d986ce67c0c..4e72458932c 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -82,12 +82,12 @@ .mr-compare.merge-request %ul.nav.nav-tabs.merge-request-tabs - %li.commits-tab{data: {action: 'commits'}} + %li.commits-tab{data: {action: 'commits', toggle: 'tab'}} = link_to url_for(params) do %i.fa.fa-history Commits %span.badge= @commits.size - %li.diffs-tab{data: {action: 'diffs'}} + %li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}} = link_to url_for(params) do %i.fa.fa-list-alt Changes |