Commit graph

67 commits

Author SHA1 Message Date
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
488bd2df2f settings: Add argument to select rebase as merge strategy. 2016-06-27 13:16:10 +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
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 Kuzminski
2ac185151d markdown: enable gfm globally 2016-07-01 17:47:59 +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
Marcin Kuzminski
42ba785d95 markdown: enable full githubFlavoredMarkdown 2016-06-29 00:51:18 +02:00
Daniel Dourvaris
46ab48ce5e celery: set global CELERY_ENABLED on any connection error 2016-06-30 19:38:31 +03:00
Martin Bornhold
2b5bd1c3a9 admin: Add helper to get the registry from requests. 2016-06-29 09:49:55 +02:00
Marcin Kuzminski
68bbf9bd37 caches: make sure __repr__ of invalidaiton context always return strings.
- this is a part of python specs, otherwise we potentially can cause
UnicodeDecodeErrors
2016-06-28 16:58:55 +02:00
Marcin Kuzminski
594836b691 merged stable into default 2016-06-28 12:41:11 +02:00
Marcin Kuzminski
772de504bb encryption: Implement a slightly improved AesCipher encryption.
This addresses issues from #4036

- we use a backward compatible cipher that can implement HMAC signature
- with HMAC signature we can detected mangled data or wrong secret key
- this allows more explicit errors than UnicodeDecode errors
- added a new .ini values that controls strict mode
2016-06-27 19:26:03 +02:00
Marcin Kuzminski
16a626ce44 refactor: renamed get_first_admin to get_first_super_admin which
reflects better what kind of user we're fetching.
2016-06-28 01:24:24 +02:00
Marcin Kuzminski
7902155b2e settings: use invalidate after updating settings. 2016-06-27 22:46:33 +02:00
Marcin Kuzminski
cf352c6625 paster: fix redundant question on writable dir. The question needs to
be asked only when the dir is actually not writable.
2016-06-24 20:50:51 +02:00
Marcin Kuzminski
858cf0db77 encryption: allow to pass in alternative key for encryption values 2016-06-24 13:29:27 +02:00
Daniel Dourvaris
d017c17269 celery: log exception in the event of unknown IOError 2016-06-24 14:35:49 +03:00
Daniel Dourvaris
38df61623b celery: fixed bug where celery was not running 2016-06-24 14:21:29 +03:00
Johannes Bornhold
8a9ef796fc svn: Avoid chunked transfer for Subversion 2016-06-21 17:12:28 +02:00
Daniel Dourvaris
bf2e56d06f bugfix: missing import 2016-06-09 15:38:48 +03:00
Johannes Bornhold
e756b3e5f4 hg: Log original exception when doing the merge with rebase. 2016-06-09 12:04:59 +02:00
Daniel Dourvaris
52cea90a4b datetimes: fix datetimes to work across app, converting to utc 2016-06-09 05:49:33 +03:00
Daniel Dourvaris
bf510fd33c vcs: make commit datetimes utc 2016-06-09 05:20:58 +03:00
Johannes Bornhold
5eae0d6f48 hg: Fix up logging message for local push 2016-06-09 00:18:56 +02:00
Johannes Bornhold
1b4ce0b7a5 hg: Include state of dry_run in merge failure logging. 2016-06-08 23:57:08 +02:00
Johannes Bornhold
f42158291f hg: Clean up unused variable 2016-06-08 23:50:12 +02:00
Johannes Bornhold
0410a1f483 hg: Increase logging around merge status check 2016-06-08 23:26:40 +02:00
Marcin Kuzminski
b191ddbc07 utils: make sure we don't import any models inside utils 2016-06-23 16:17:18 +02:00
Marcin Kuzminski
a51519ed0a encryption: use common method to fetch encryption key for encrypted fields. 2016-06-23 13:48:11 +02:00
Marcin Kuzminski
055024f665 settings: use cached settings in few places we only often use it for reading. 2016-06-23 12:33:04 +02:00
Marcin Kuzminski
f81bdd6a6b helpers: commit parsers, use caching queries to save tons of time when parsing over the same repo
commit messages.
2016-06-22 11:53:47 +02:00
Marcin Kuzminski
a30ccd1470 helpers: fixed some errors on helpers, and removed dead code. 2016-06-22 11:32:13 +02:00
Marcin Kuzminski
4531ebf106 helpers: optimize slight calls for link_to_user to save some
intense queries.
2016-06-21 20:14:15 +02:00
Daniel Dourvaris
80943648ff debug: skip model.settings query logging 2016-06-22 14:57:37 +03:00
Martin Bornhold
6b84fcdb1d threading: Use the curl session factory. 2016-06-22 10:18:33 +02:00
Martin Bornhold
4a1c60fba2 threading: Add factory that creates curl session for each thread.
When creating a repo with an import url pointing to another repo on the same enterprise instance
we call the vcssserver to check the url. The vcsserver then calls to enterprise to verify the url.
This leads to two threads using the same cur session.
2016-06-22 10:18:06 +02:00
Johannes Bornhold
f3a1987cc5 migration: Add data migration of the users 'extern_type' attribute.
- Folow up from renaming the auth_container plugin.
- This migration renames the extern type for all users from 'container' to 'headers'
2016-06-06 15:50:15 +02:00
Johannes Bornhold
422f825bb8 db: Move initialization of test environment up to pyramid layer. 2016-06-07 09:31:33 +02:00
Daniel Dourvaris
be2bf30c95 permissions: show overridden permissions in permission summary page 2016-06-06 05:58:37 +03:00
Johannes Bornhold
ba5c7add8f db: Create database migration to rename token auth plugin ID. 2016-06-03 11:32:55 +02:00
Marcin Kuzminski
c0b1b33fac logging: improve logging on failed auth user lookup 2016-06-03 01:12:17 +02:00
Daniel Dourvaris
1e4d5986fb search: update whoosh fallback schema to sort on date too 2016-06-02 15:23:50 +03:00
Daniel Dourvaris
8f434d0117 search: sort commit messages by date rather than revision 2016-06-02 15:17:46 +03:00
Daniel Dourvaris
545fe36195 bugfix: missing import 2016-06-01 16:27:02 +03:00
Daniel Dourvaris
dbb993b0d4 logging: log the original error when a merge failure occurs 2016-05-31 16:08:21 +03:00
Daniel Dourvaris
c683b5b179 feature: Go To switcher now searches commit hashes as well 2016-05-30 16:05:27 +03:00
Johannes Bornhold
d1a5de5268 authn: Data migration for renaming 'container' to 'headers'.
Rename the 'auth_plugins' setting and all 'auth_container_%s' settings.
2016-05-31 11:01:42 +02:00