Mercurial > kallithea
changeset 3613:6bc4b63bb225 beta
use merge param in compare link for it to work as expected
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 27 Mar 2013 18:47:40 +0100 |
| parents | a8373e8fff51 |
| children | e8db9fe4cca3 |
| files | rhodecode/templates/base/base.html |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/templates/base/base.html Tue Mar 26 23:30:20 2013 +0100 +++ b/rhodecode/templates/base/base.html Wed Mar 27 18:47:40 2013 +0100 @@ -123,7 +123,7 @@ %endif %endif %if c.rhodecode_db_repo.fork: - <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}</li> + <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default', merge=1),class_='compare_request')}</li> %endif <li>${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li> <li>${h.link_to(_('Search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>