|
...
|
...
|
@@ -174,35 +174,36 @@
|
|
174
|
174
|
% }
|
|
175
|
175
|
</div>
|
|
176
|
176
|
</div>
|
|
177
|
|
-
|
|
178
|
|
- <div id="base-branch-popup" style="display:none;width:330px;position:absolute">
|
|
179
|
|
- <div class="radius-top border-gray" style="background:#E6E6FA;padding:10px">
|
|
180
|
|
- <div style="overflow:hidden">
|
|
181
|
|
- <div style="float:left;width:90%;">
|
|
182
|
|
- <b>Choose a base branch</b>
|
|
183
|
|
- </div>
|
|
184
|
|
- <div style="float:left:width:10%;text-align:right;">
|
|
185
|
|
- <i id="base-branch-close" class="icon-remove-circle"></i>
|
|
|
177
|
+
|
|
|
178
|
+ % if ($merge_automatical) {
|
|
|
179
|
+ <div id="base-branch-popup" style="display:none;width:330px;position:absolute">
|
|
|
180
|
+ <div class="radius-top border-gray" style="background:#E6E6FA;padding:10px">
|
|
|
181
|
+ <div style="overflow:hidden">
|
|
|
182
|
+ <div style="float:left;width:90%;">
|
|
|
183
|
+ <b>Choose a base branch</b>
|
|
|
184
|
+ </div>
|
|
|
185
|
+ <div style="float:left:width:10%;text-align:right;">
|
|
|
186
|
+ <i id="base-branch-close" class="icon-remove-circle"></i>
|
|
|
187
|
+ </div>
|
|
186
|
188
|
</div>
|
|
187
|
189
|
</div>
|
|
|
190
|
+ <div class="border-gray" style="background:#F5F5F5;border-top:none;border-bottom:none;text-align:center;padding:10px 0">
|
|
|
191
|
+ %= text_field 'base-branch', style => 'margin-bottom:0;width:270px', placeholder => 'Branch, tag, commit, or history marker';
|
|
|
192
|
+ </div>
|
|
|
193
|
+ <div style="background:white;max-height:500px;overflow:auto;">
|
|
|
194
|
+ <ul class="nav nav-tabs nav-stacked">
|
|
|
195
|
+ % for (my $i = 0; $i < @$branches; $i++) {
|
|
|
196
|
+ % my $branch = $branches->[$i];
|
|
|
197
|
+ <li>
|
|
|
198
|
+ <a style="border-top-left-radius:0px;border-top-right-radius:0px;" href="<%= url_for("/$user/$project/compare/$branch->{name}...$rev") %>">
|
|
|
199
|
+ <%= $branch->{name} %>
|
|
|
200
|
+ </a>
|
|
|
201
|
+ </li>
|
|
|
202
|
+ % }
|
|
|
203
|
+ </ul>
|
|
|
204
|
+ </div>
|
|
188
|
205
|
</div>
|
|
189
|
|
- <div class="border-gray" style="background:#F5F5F5;border-top:none;border-bottom:none;text-align:center;padding:10px 0">
|
|
190
|
|
- %= text_field 'base-branch', style => 'margin-bottom:0;width:270px', placeholder => 'Branch, tag, commit, or history marker';
|
|
191
|
|
- </div>
|
|
192
|
|
- <div style="background:white;max-height:500px;overflow:auto;">
|
|
193
|
|
- <ul class="nav nav-tabs nav-stacked">
|
|
194
|
|
- % for (my $i = 0; $i < @$branches; $i++) {
|
|
195
|
|
- % my $branch = $branches->[$i];
|
|
196
|
|
- <li>
|
|
197
|
|
- <a style="border-top-left-radius:0px;border-top-right-radius:0px;" href="<%= url_for("/$user/$project/compare/$branch->{name}...$rev") %>">
|
|
198
|
|
- <%= $branch->{name} %>
|
|
199
|
|
- </a>
|
|
200
|
|
- </li>
|
|
201
|
|
- % }
|
|
202
|
|
- </ul>
|
|
203
|
|
- </div>
|
|
204
|
|
- </div>
|
|
205
|
|
-
|
|
|
206
|
+ % }
|
|
206
|
207
|
<div id="compare-branch-popup" style="display:none;width:330px;position:absolute">
|
|
207
|
208
|
<div class="radius-top border-gray" style="background:#E6E6FA;padding:10px">
|
|
208
|
209
|
<div style="overflow:hidden">
|