Martin Bornhold
77c3287d4a
settings: Delete obsolete code related to the rebase-merge lab settings.
2016-06-27 16:53:36 +02:00
Martin Bornhold
0f767f23a4
settings: Remove obsolete VCS config value HG_USE_REBASE_FOR_MERGING
2016-06-27 13:30:27 +02:00
Martin Bornhold
1824a54c6d
settings: Use the new 'use_rebase' argument to decide between rebase or merge.
2016-06-27 13:18:25 +02:00
Martin Bornhold
b545575d28
settings: Read 'rebase-merge' config option and pass it to the VCS insntacen on merge.
2016-06-27 13:17:41 +02:00
Martin Bornhold
488bd2df2f
settings: Add argument to select rebase as merge strategy.
2016-06-27 13:16:10 +02:00
Martin Bornhold
d80ead44a9
settings: Display 'rebase-merge' option in VCS settings.
2016-06-27 11:00:57 +02:00
Martin Bornhold
b3a1dec11e
settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model.
2016-06-27 11:00:22 +02:00
Martin Bornhold
b0612b7dc6
settings: Add 'labs_active' flag to template context.
2016-06-27 10:58:53 +02:00
Marcin Kuzminski
e5f91c3075
deps: bumped supervisor to 3.3.0 and psycopg2 to 2.6.1
2016-07-05 13:06:43 +02:00
Martin Bornhold
dec51f1669
pyro: Slightly improved log message and comment.
2016-07-05 09:37:57 +02:00
Martin Bornhold
64893dfad5
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.
2016-07-05 09:37:13 +02:00
Marcin Kuzminski
d29f7ba684
notify-script: allow to comment also on single commit
2016-07-05 09:59:10 +02:00
Marcin Kuzminski
60b6490ced
api: make comment_commits api have consistent permissions with web interface.
2016-07-05 09:56:44 +02:00
Marcin Kuzminski
9763f430b4
tests: fixed test after update of cs cache changes.
2016-07-04 23:55:36 +02:00
Marcin Kuzminski
7a74dfce1a
packaging: updated pygments to 2.1.3, fixes #4034
2016-07-04 23:32:34 +02:00
Marcin Kuzminski
79bb294282
system: send platform and version to upgrade endpoint.
2016-07-04 23:23:55 +02:00
Marcin Kuzminski
28876607b7
diff2way: fixed unicode problem on non-ascii files.
2016-07-04 23:18:20 +02:00
Marcin Kuzminski
c4c18efd81
js: updated mergely to 3.4.1
2016-07-04 23:13:42 +02:00
Marcin Kuzminski
f94b2c50d6
codemirror: update from 5.4.0 to 5.11.0, fixes #3154
2016-07-04 22:19:23 +02:00
lisaq
3a01852b49
styling: adds README styling for #4054 GFM
2016-07-04 17:26:32 +02:00
lisaq
9506a7f041
styling: GFM tweaks #4054
2016-06-30 15:23:53 +02:00
Martin Bornhold
ae1070b18a
tests: Add an autouse fixture to patch the pyro proxy factory.
2016-07-04 15:46:29 +02:00
Martin Bornhold
ed4653ad21
pyro: Make request argument mandatory.
2016-07-04 15:44:15 +02:00
Martin Bornhold
20205cf371
pyro4: Create pyro proxy factory which returns instaces scoped by the request.
2016-07-04 16:35:03 +02:00
Marcin Lulek
81fbfe0335
frontend: topics implementation needs to live in CE edition
2016-07-04 16:13:43 +02:00
Daniel Dourvaris
a9d0598239
scm: change update_commit_cache to check revision as well
2016-07-04 16:13:53 +03:00
Daniel Dourvaris
dfa2ef3a7f
scm: add tests for .mark_for_invalidation(delete=True)
2016-07-01 15:21:08 +03:00
Daniel Dourvaris
4915a005dc
scm: clear the cs cache on delete/remap
2016-07-01 14:17:50 +03:00
Marcin Kuzminski
e060b2bdad
i18n: updated messages catalog
2016-07-04 14:07:41 +02:00
Marcin Kuzminski
a1cfd451bb
i18n-js: updated messages based on the new extractors
2016-07-04 14:07:03 +02:00
Marcin Kuzminski
83b9fcd4da
release: merge back stable branch into default
2016-07-04 12:38:32 +02:00
Marcin Kuzminski
deccd5240d
Added tag v4.2.1 for changeset 32a70c7e5684
2016-07-04 10:32:35 +00:00
Marcin Kuzminski
853e5ab212
release: Finish preparation for 4.2.1
2016-07-04 10:32:34 +00:00
Marcin Kuzminski
ee86ca8b6a
release: updated pip2nix output for 4.2.1
2016-07-04 10:32:33 +00:00
Marcin Kuzminski
9bc6163776
release: Start preparation for 4.2.1
2016-07-04 10:18:21 +00:00
Marcin Kuzminski
9156ae8b3d
docs: add release notes for 4.2.1
2016-07-04 09:21:44 +02:00
Marcin Kuzminski
7e84bfc9d7
login: fixed bad routing URL in comments, fixes #4065
2016-07-04 00:39:43 +02:00
Marcin Kuzminski
7a0340eae1
packaging: put dogpile packages into nix pkgs.
2016-07-01 18:03:47 +02:00
Marcin Kuzminski
3db34079bd
setup:added missing py-gfm
2016-07-01 17:49:01 +02:00
Marcin Kuzminski
2ac185151d
markdown: enable gfm globally
2016-07-01 17:47:59 +02:00
Marcin Lulek
8abd31cc4f
setup: require dogpile.cache and core
2016-07-01 17:29:36 +02:00
Marcin Kuzminski
4a0ec29bf9
deps: bumped dogpile.cache to version 0.6.1
2016-07-01 17:00:41 +02:00
Marcin Kuzminski
4da05a5506
markdown: enable gfm by default, this is much standard now and we should use it instead of plain markdown
2016-07-01 13:41:14 +02:00
Daniel Dourvaris
ee2ad291ed
celery: set global CELERY_ENABLED on any connection error
2016-06-30 19:38:31 +03:00
Marcin Kuzminski
2fa4556f4a
i18n: added JS extractors to work with the standard extract_messages command.
2016-07-04 00:02:14 +02:00
Marcin Kuzminski
605b26b460
i18n: replaced fragile extraction of JS translations from an _TM variable.
...
We replaced it with similar to babel functions _gettext, and _ngettext, that
will prevent UI from breaking in case of untranslated strings. This
also will allow to use babel built in extractors to fetch the translations
stored inside html and JS.
2016-07-03 23:52:22 +02:00
Marcin Kuzminski
b39ba081a2
i18n: added JS utils for translation.
2016-07-03 23:45:00 +02:00
Marcin Kuzminski
cba5d93aca
Added tag v4.2.0 for changeset baaf9f5bcea3
2016-06-30 17:23:41 +00:00
Marcin Kuzminski
83917fd3d4
release: Finish preparation for 4.2.0
2016-06-30 17:23:39 +00:00
Marcin Kuzminski
658ffcdc8c
release: updated pip2nix output for 4.2.0
2016-06-30 17:23:36 +00:00
