##// END OF EJS Templates
u » ewong » rhodecode-enterprise-ce-fork
RSS

Fork of rhodecode-enterprise-ce

settings: Display 'rebase-merge' option in VCS settings.
Martin Bornhold -
r359:d861bb79 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,216 +1,235 b''
1 1 ## snippet for displaying vcs settings
2 2 ## usage:
3 3 ## <%namespace name="vcss" file="/base/vcssettings.html"/>
4 4 ## ${vcss.vcs_settings_fields()}
5 5
6 6 <%def name="vcs_settings_fields(suffix='', svn_branch_patterns=None, svn_tag_patterns=None, repo_type=None, display_globals=False, allow_repo_location_change=False, **kwargs)">
7 7 % if display_globals:
8 8 <div class="panel panel-default">
9 9 <div class="panel-heading" id="general">
10 10 <h3 class="panel-title">${_('General')}</h3>
11 11 </div>
12 12 <div class="panel-body">
13 13 <div class="field">
14 14 <div class="checkbox">
15 15 ${h.checkbox('web_push_ssl' + suffix, 'True')}
16 16 <label for="web_push_ssl${suffix}">${_('Require SSL for vcs operations')}</label>
17 17 </div>
18 18 <div class="label">
19 19 <span class="help-block">${_('Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')}</span>
20 20 </div>
21 21 </div>
22 22 </div>
23 23 </div>
24 24 % endif
25 25
26 26 % if display_globals:
27 27 <div class="panel panel-default">
28 28 <div class="panel-heading">
29 29 <h3 class="panel-title">${_('Main Storage Location')}</h3>
30 30 </div>
31 31 <div class="panel-body">
32 32 <div class="field">
33 33 <div class="inputx locked_input">
34 34 %if allow_repo_location_change:
35 35 ${h.text('paths_root_path',size=59,readonly="readonly", class_="disabled")}
36 36 <span id="path_unlock" class="tooltip"
37 37 title="${h.tooltip(_('Click to unlock. You must restart RhodeCode in order to make this setting take effect.'))}">
38 38 <div class="btn btn-default lock_input_button"><i id="path_unlock_icon" class="icon-lock"></i></div>
39 39 </span>
40 40 %else:
41 41 ${_('Repository location change is disabled. You can enable this by changing the `allow_repo_location_change` inside .ini file.')}
42 42 ## form still requires this but we cannot internally change it anyway
43 43 ${h.hidden('paths_root_path',size=30,readonly="readonly", class_="disabled")}
44 44 %endif
45 45 </div>
46 46 </div>
47 47 <div class="label">
48 48 <span class="help-block">${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')}</span>
49 49 </div>
50 50 </div>
51 51 </div>
52 52 % endif
53 53
54 54 % if display_globals or repo_type in ['git', 'hg']:
55 55 <div class="panel panel-default">
56 56 <div class="panel-heading" id="general">
57 57 <h3 class="panel-title">${_('Internal Hooks')}</h3>
58 58 </div>
59 59 <div class="panel-body">
60 60 <div class="field">
61 61 <div class="checkbox">
62 62 ${h.checkbox('hooks_changegroup_repo_size' + suffix, 'True', **kwargs)}
63 63 <label for="hooks_changegroup_repo_size${suffix}">${_('Show repository size after push')}</label>
64 64 </div>
65 65
66 66 <div class="label">
67 67 <span class="help-block">${_('Trigger a hook that calculates repository size after each push.')}</span>
68 68 </div>
69 69 <div class="checkbox">
70 70 ${h.checkbox('hooks_changegroup_push_logger' + suffix, 'True', **kwargs)}
71 71 <label for="hooks_changegroup_push_logger${suffix}">${_('Execute pre/post push hooks')}</label>
72 72 </div>
73 73 <div class="label">
74 74 <span class="help-block">${_('Execute Built in pre/post push hooks. This also executes rcextensions hooks.')}</span>
75 75 </div>
76 76 <div class="checkbox">
77 77 ${h.checkbox('hooks_outgoing_pull_logger' + suffix, 'True', **kwargs)}
78 78 <label for="hooks_outgoing_pull_logger${suffix}">${_('Execute pre/post pull hooks')}</label>
79 79 </div>
80 80 <div class="label">
81 81 <span class="help-block">${_('Execute Built in pre/post pull hooks. This also executes rcextensions hooks.')}</span>
82 82 </div>
83 83 </div>
84 84 </div>
85 85 </div>
86 86 % endif
87 87
88 88 % if display_globals or repo_type in ['hg']:
89 89 <div class="panel panel-default">
90 90 <div class="panel-heading">
91 91 <h3 class="panel-title">${_('Mercurial Settings')}</h3>
92 92 </div>
93 93 <div class="panel-body">
94 94 <div class="checkbox">
95 95 ${h.checkbox('extensions_largefiles' + suffix, 'True', **kwargs)}
96 96 <label for="extensions_largefiles${suffix}">${_('Enable largefiles extension')}</label>
97 97 </div>
98 98 <div class="label">
99 99 <span class="help-block">${_('Enable Largefiles extensions for all repositories.')}</span>
100 100 </div>
101 101 <div class="checkbox">
102 102 ${h.checkbox('phases_publish' + suffix, 'True', **kwargs)}
103 103 <label for="phases_publish${suffix}">${_('Set repositories as publishing') if display_globals else _('Set repository as publishing')}</label>
104 104 </div>
105 105 <div class="label">
106 106 <span class="help-block">${_('When this is enabled all commits in the repository are seen as public commits by clients.')}</span>
107 107 </div>
108 108 % if display_globals:
109 109 <div class="checkbox">
110 110 ${h.checkbox('extensions_hgsubversion' + suffix,'True')}
111 111 <label for="extensions_hgsubversion${suffix}">${_('Enable hgsubversion extension')}</label>
112 112 </div>
113 113 <div class="label">
114 114 <span class="help-block">${_('Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type.')}</span>
115 115 </div>
116 116 % endif
117 117 </div>
118 118 </div>
119 119 % endif
120 120
121 121 % if display_globals or repo_type in ['svn']:
122 122 <div class="panel panel-default">
123 123 <div class="panel-heading">
124 124 <h3 class="panel-title">${_('Subversion Settings')}</h3>
125 125 </div>
126 126 <div class="panel-body">
127 127 <div class="field">
128 128 <div class="content" >
129 129 <label>${_('Repository patterns')}</label><br/>
130 130 </div>
131 131 </div>
132 132 <div class="label">
133 133 <span class="help-block">${_('Patterns for identifying SVN branches and tags. For recursive search, use "*". Eg.: "/branches/*"')}</span>
134 134 </div>
135 135
136 136 <div class="field branch_patterns">
137 137 <div class="input" >
138 138 <label>${_('Branches')}:</label><br/>
139 139 </div>
140 140 % if svn_branch_patterns:
141 141 % for branch in svn_branch_patterns:
142 142 <div class="input adjacent" id="${'id%s' % branch.ui_id}">
143 143 ${h.hidden('branch_ui_key' + suffix, branch.ui_key)}
144 144 ${h.text('branch_value_%d' % branch.ui_id + suffix, branch.ui_value, size=59, readonly="readonly", class_='disabled')}
145 145 % if kwargs.get('disabled') != 'disabled':
146 146 <span class="btn btn-x" onclick="ajaxDeletePattern(${branch.ui_id},'${'id%s' % branch.ui_id}')">
147 147 ${_('Delete')}
148 148 </span>
149 149 % endif
150 150 </div>
151 151 % endfor
152 152 %endif
153 153 </div>
154 154 % if kwargs.get('disabled') != 'disabled':
155 155 <div class="field branch_patterns">
156 156 <div class="input" >
157 157 ${h.text('new_svn_branch',size=59,placeholder='New branch pattern')}
158 158 </div>
159 159 </div>
160 160 % endif
161 161 <div class="field tag_patterns">
162 162 <div class="input" >
163 163 <label>${_('Tags')}:</label><br/>
164 164 </div>
165 165 % if svn_tag_patterns:
166 166 % for tag in svn_tag_patterns:
167 167 <div class="input" id="${'id%s' % tag.ui_id + suffix}">
168 168 ${h.hidden('tag_ui_key' + suffix, tag.ui_key)}
169 169 ${h.text('tag_ui_value_new_%d' % tag.ui_id + suffix, tag.ui_value, size=59, readonly="readonly", class_='disabled tag_input')}
170 170 % if kwargs.get('disabled') != 'disabled':
171 171 <span class="btn btn-x" onclick="ajaxDeletePattern(${tag.ui_id},'${'id%s' % tag.ui_id}')">
172 172 ${_('Delete')}
173 173 </span>
174 174 %endif
175 175 </div>
176 176 % endfor
177 177 % endif
178 178 </div>
179 179 % if kwargs.get('disabled') != 'disabled':
180 180 <div class="field tag_patterns">
181 181 <div class="input" >
182 182 ${h.text('new_svn_tag' + suffix, size=59, placeholder='New tag pattern')}
183 183 </div>
184 184 </div>
185 185 %endif
186 186 </div>
187 187 </div>
188 188 % else:
189 189 ${h.hidden('new_svn_branch' + suffix, '')}
190 190 ${h.hidden('new_svn_tag' + suffix, '')}
191 191 % endif
192 192
193 193 % if display_globals or repo_type in ['hg', 'git']:
194 194 <div class="panel panel-default">
195 195 <div class="panel-heading">
196 196 <h3 class="panel-title">${_('Pull Request Settings')}</h3>
197 197 </div>
198 198 <div class="panel-body">
199 199 <div class="checkbox">
200 200 ${h.checkbox('rhodecode_pr_merge_enabled' + suffix, 'True', **kwargs)}
201 201 <label for="rhodecode_pr_merge_enabled${suffix}">${_('Enable server-side merge for pull requests')}</label>
202 202 </div>
203 203 <div class="label">
204 204 <span class="help-block">${_('Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface.')}</span>
205 205 </div>
206 206 <div class="checkbox">
207 207 ${h.checkbox('rhodecode_use_outdated_comments' + suffix, 'True', **kwargs)}
208 208 <label for="rhodecode_use_outdated_comments${suffix}">${_('Invalidate and relocate inline comments during update')}</label>
209 209 </div>
210 210 <div class="label">
211 211 <span class="help-block">${_('During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden.')}</span>
212 212 </div>
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