Mercurial > kallithea
comparison rhodecode/templates/pullrequests/pullrequest.html @ 3486:2053053e0882 beta
compare/pullrequest: introduce merge parameter
This is more correct and flexible than the old way of looking on same/different
repo.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 05 Mar 2013 11:55:01 +0100 |
parents | 75e563531350 |
children | ff3f10a6a203 |
comparison
equal
deleted
inserted
replaced
3485:b19b1723ff10 | 3486:2053053e0882 |
---|---|
131 org_ref='__other_ref__', | 131 org_ref='__other_ref__', |
132 other_repo='__org_repo__', | 132 other_repo='__org_repo__', |
133 other_ref_type='__org_ref_type__', | 133 other_ref_type='__org_ref_type__', |
134 other_ref='__org_ref__', | 134 other_ref='__org_ref__', |
135 as_form=True, | 135 as_form=True, |
136 merge=True, | |
136 )}"; | 137 )}"; |
137 var org_repo = YUQ('#pull_request_form #org_repo')[0].value; | 138 var org_repo = YUQ('#pull_request_form #org_repo')[0].value; |
138 var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':'); | 139 var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':'); |
139 | 140 |
140 var other_repo = YUQ('#pull_request_form #other_repo')[0].value; | 141 var other_repo = YUQ('#pull_request_form #other_repo')[0].value; |