##// END OF EJS Templates
settings: Display 'rebase-merge' option in VCS settings.
Martin Bornhold -
r359:d861bb79 default
parent child Browse files
Show More
@@ -213,4 +213,23 b''
213 213 </div>
214 214 </div>
215 215 % endif
216
217 ## This condition has to be adapted if we add more labs settings for
218 ## VCS types other than 'hg'
219 % if c.labs_active and (display_globals or repo_type in ['hg']):
220 <div class="panel panel-danger">
221 <div class="panel-heading">
222 <h3 class="panel-title">${_('Labs settings')}</h3>
223 </div>
224 <div class="panel-body">
225 <div class="checkbox">
226 ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)}
227 <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Mercurial server-side merge')}</label>
228 </div>
229 <div class="label">
230 <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface')}</span>
231 </div>
232 </div>
233 </div>
234 % endif
216 235 </%def>
General Comments 0
You need to be logged in to leave comments. Login now