Show More
@@ -126,7 +126,7 b'' | |||
|
126 | 126 | |
|
127 | 127 | <div class="checkbox"> |
|
128 | 128 | ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)} |
|
129 | <label for="rhodecode_hg_use_rebase_for_merging{suffix}">${_('Use rebase as merge strategy')}</label> | |
|
129 | <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Use rebase as merge strategy')}</label> | |
|
130 | 130 | </div> |
|
131 | 131 | <div class="label"> |
|
132 | 132 | <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface.')}</span> |
@@ -147,7 +147,7 b'' | |||
|
147 | 147 | <div class="field"> |
|
148 | 148 | <div class="checkbox"> |
|
149 | 149 | ${h.checkbox('vcs_svn_proxy_http_requests_enabled' + suffix, 'True', **kwargs)} |
|
150 | <label for="vcs_svn_proxy_http_requests_enabled{suffix}">${_('Proxy subversion HTTP requests')}</label> | |
|
150 | <label for="vcs_svn_proxy_http_requests_enabled${suffix}">${_('Proxy subversion HTTP requests')}</label> | |
|
151 | 151 | </div> |
|
152 | 152 | <div class="label"> |
|
153 | 153 | <span class="help-block">${_('Subversion HTTP Support. Enables communication with SVN over HTTP protocol.')}</span> |
General Comments 0
You need to be logged in to leave comments.
Login now