##// END OF EJS Templates
Commit Message Age Author Refs
load previous
r362:c14bb309
settings: Use the new 'use_rebase' argument to decide between rebase or merge.
Martin Bornhold
0
r361:813d7f2f
settings: Read 'rebase-merge' config option and pass it to the VCS insntacen on merge.
Martin Bornhold
0
r360:978630ac
settings: Add argument to select rebase as merge strategy.
Martin Bornhold
0
r359:d861bb79
settings: Display 'rebase-merge' option in VCS settings.
Martin Bornhold
0
r358:fff85101
settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.
Martin Bornhold
0
r357:bd7af94f
settings: Add 'labs_active' flag to template context.
Martin Bornhold
0
r356:71758b0c
deps: bumped supervisor to 3.3.0 and psycopg2 to 2.6.1
0
r355:12bfd543
pyro: Slightly improved log message and comment.
Martin Bornhold
0
r354:4f555b55
pyro: Return new proxy instances if called from outside of a request context. This allows to run code that uses the pyro connection to the VCSServer but does not execute from within a request context, e.g. invoke tasks.
Martin Bornhold
0
r353:d5c4e7ee
notify-script: allow to comment also on single commit
0
r352:71dfb19a
api: make comment_commits api have consistent permissions with web interface.
0
r351:b15f3d23
tests: fixed test after update of cs cache changes.
0
r350:26a3a2ef
packaging: updated pygments to 2.1.3, fixes #4034
0
r349:cf7b740d
system: send platform and version to upgrade endpoint.
0
r348:cf59a3cf
diff2way: fixed unicode problem on non-ascii files.
0
r347:99b6d323
js: updated mergely to 3.4.1
0
r346:1a48416d
codemirror: update from 5.4.0 to 5.11.0, fixes #3154
0
r345:190afce4
styling: adds README styling for #4054 GFM
0
r344:ddfb12e0
styling: GFM tweaks #4054
0
r343:73e7f43f
tests: Add an autouse fixture to patch the pyro proxy factory.
Martin Bornhold
0
load next
< 1 .. 213 214 215 216 217 .. 231 >
showing 20 out of 4604 commits