Show More
| @@ -116,6 +116,26 b'' | |||||
| 116 | % endif |
|
116 | % endif | |
| 117 | </div> |
|
117 | </div> | |
| 118 | </div> |
|
118 | </div> | |
|
|
119 | ## LABS for HG | |||
|
|
120 | % if c.labs_active: | |||
|
|
121 | <div class="panel panel-danger"> | |||
|
|
122 | <div class="panel-heading"> | |||
|
|
123 | <h3 class="panel-title">${_('Mercurial Labs Settings')} (${_('These features are considered experimental and may not work as expected.')})</h3> | |||
|
|
124 | </div> | |||
|
|
125 | <div class="panel-body"> | |||
|
|
126 | ||||
|
|
127 | <div class="checkbox"> | |||
|
|
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> | |||
|
|
130 | </div> | |||
|
|
131 | <div class="label"> | |||
|
|
132 | <span class="help-block">${_('Use rebase instead of creating a merge commit when merging via web interface.')}</span> | |||
|
|
133 | </div> | |||
|
|
134 | ||||
|
|
135 | </div> | |||
|
|
136 | </div> | |||
|
|
137 | % endif | |||
|
|
138 | ||||
| 119 | % endif |
|
139 | % endif | |
| 120 |
|
140 | |||
| 121 | % if display_globals or repo_type in ['svn']: |
|
141 | % if display_globals or repo_type in ['svn']: | |
| @@ -143,7 +163,7 b'' | |||||
| 143 | </div> |
|
163 | </div> | |
| 144 | <div class="field"> |
|
164 | <div class="field"> | |
| 145 | <div class="label"> |
|
165 | <div class="label"> | |
| 146 | <span class="help-block">${_('e.g. http://localhost:8080/')}</span> |
|
166 | <span class="help-block">${_('Url to Apache Proxy, e.g. http://localhost:8080/')}</span> | |
| 147 | </div> |
|
167 | </div> | |
| 148 | </div> |
|
168 | </div> | |
| 149 | <div class="field"> |
|
169 | <div class="field"> | |
| @@ -236,31 +256,4 b'' | |||||
| 236 | </div> |
|
256 | </div> | |
| 237 | % endif |
|
257 | % endif | |
| 238 |
|
258 | |||
| 239 | ## This condition has to be adapted if we add more labs settings for |
|
|||
| 240 | ## VCS types other than 'hg' |
|
|||
| 241 | % if c.labs_active and (display_globals or repo_type in ['hg']): |
|
|||
| 242 | <div class="panel panel-danger"> |
|
|||
| 243 | <div class="panel-heading"> |
|
|||
| 244 | <h3 class="panel-title">${_('Labs settings')}: ${_('These features are considered experimental and may not work as expected.')}</h3> |
|
|||
| 245 | </div> |
|
|||
| 246 | <div class="panel-body"> |
|
|||
| 247 | <div class="fields"> |
|
|||
| 248 |
|
||||
| 249 | <div class="field"> |
|
|||
| 250 | <div class="label"> |
|
|||
| 251 | <label>${_('Mercurial server-side merge')}:</label> |
|
|||
| 252 | </div> |
|
|||
| 253 | <div class="checkboxes"> |
|
|||
| 254 | <div class="checkbox"> |
|
|||
| 255 | ${h.checkbox('rhodecode_hg_use_rebase_for_merging' + suffix, 'True', **kwargs)} |
|
|||
| 256 | <label for="rhodecode_hg_use_rebase_for_merging${suffix}">${_('Use rebase instead of creating a merge commit when merging via web interface')}</label> |
|
|||
| 257 | </div> |
|
|||
| 258 | <!-- <p class="help-block">Help message here</p> --> |
|
|||
| 259 | </div> |
|
|||
| 260 | </div> |
|
|||
| 261 |
|
||||
| 262 | </div> |
|
|||
| 263 | </div> |
|
|||
| 264 | </div> |
|
|||
| 265 | % endif |
|
|||
| 266 | </%def> |
|
259 | </%def> | |
General Comments 0
You need to be logged in to leave comments.
Login now