Commit graph

150 commits

Author SHA1 Message Date
Johannes Bornhold
ebec853ea6 pull_request: Increase debug logging around merge. 2016-06-09 00:19:16 +02: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
15c32d35d1 packaging: Clean up call to read the version
There is no need to wrap it in a string, we can call it directly.
2016-06-08 23:48:16 +02:00
Marcin Kuzminski
de4beeeadb docs: updated some installation instructions 2016-06-08 23:13:16 +02:00
Johannes Bornhold
184fcd3166 dependencies: Add futures as a dependency of Gunicorn.
Gunicorn needs futures on Python 2 when used with multiple threads per worker.

This is addressing issue #3995.
2016-06-08 22:02:30 +02:00
Johannes Bornhold
0410a1f483 hg: Increase logging around merge status check 2016-06-08 23:26:40 +02:00
Johannes Bornhold
6b65e5d1d4 pull_request: Add debug logging around merge status calculation
Goal is to see better traces of the business logic when trying to find out if a
pull request can be merged or not.
2016-06-08 23:26:02 +02:00
Johannes Bornhold
5b843106a1 tests: Adapt test to new mercurial version (3.8.2)
Mercurial changed their diff algorithm a little bit which leads to
one more added and delted line. But the result is the same.
2016-06-08 14:37:37 +02:00
Marcin Kuzminski
78678f0ef4 ini: production log shouldn't use debug logs for vcsserver 2016-06-08 14:18:13 +02:00
Johannes Bornhold
997191d4d4 authn: Remove doubled colon in plugin ID generation. 2016-06-06 16:15:38 +02:00
Johannes Bornhold
8ccbc6ad72 authn: Bugfix, use the fallback plugin setting in log message. 2016-06-06 16:14:37 +02:00
Johannes Bornhold
dc4d6b278b authn: Adapt authentication plugins validator to allow legacy plugins.
- We use the prefix 'py:' for legacy plugins
- Users are now able to insert plugin ID's like 'py:rhodecode.mylegacyplugins.plugin_one'
- Validator tries does an import and checks if the plugin has a 'includeme' attribute.
2016-06-06 13:35:58 +02:00
Johannes Bornhold
f8e4aa4dcc authn: Small refactoring of plugin discovery. 2016-06-06 13:26:37 +02:00
Johannes Bornhold
5d2d8f4267 authn: Make the legacy plugin import more robust if something fails during import. 2016-06-06 11:26:27 +02:00
Johannes Bornhold
834ce812c6 authn: Allow users to store plugin ID's starting with the legacy plugin prefix. 2016-06-06 11:25:22 +02:00
Johannes Bornhold
3e49389eff authn: Store legacy plugins prefix in module variable. 2016-06-06 11:24:23 +02:00
Johannes Bornhold
8906d7163b authn: Add docstring to function that discovers legacy plugins. 2016-06-06 10:49:40 +02:00
Johannes Bornhold
a8d92f8858 authn: Import legacy authentication modules and invoke their includeme. 2016-06-06 10:07:24 +02:00
Johannes Bornhold
6868abc1b7 authn: Load legacy plugin ID's from DB and log them. 2016-06-06 09:11:39 +02:00
Johannes Bornhold
a25c34f04e migration: Increased database version. 2016-06-06 15:50:45 +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
Marcin Kuzminski
14cb9ac285 ldap-auth: fixed wrong Missing check 2016-06-08 14:03:02 +02:00
Marcin Kuzminski
7aea1304de ini: fixed typo, remove debug style from production 2016-06-08 13:52:53 +02:00
Marcin Kuzminski
fc2d1e71b4 ini: in CE repo we don't expose EE edition configuration. 2016-06-08 13:32:10 +02:00
Marcin Kuzminski
0d7034e500 ini: fixed a typo 2016-06-08 13:09:46 +02:00
Marcin Kuzminski
3c9a669279 configs: updated dev and production ini files.
- make sure production recommends gunicorn
- make sure we're in sync with all OPTIONS from EE as well
- small tweeks and docs
2016-06-08 13:03:31 +02:00
Johannes Bornhold
ec516d16f1 db: Move db setup code to seperate function. 2016-06-07 17:17:28 +02:00
Marcin Kuzminski
a9e7becc0e docs: updated apache/nginx configs 2016-06-07 22:05:18 +02:00
Johannes Bornhold
1dcac5eddc db: Remove comment line. 2016-06-07 12:07:51 +02:00
Johannes Bornhold
7fefcc4ffb db: Set rhodecode.is_test in make_pyramid_app instead of make_app
Based on this setting the crypto backend is selected: brypt or md5.
During tests md5 is used to sppedup test execution. We have to move this
setting up to the pyramid layer otherwise the test DB init will use bcrypt
and the tests use md5. This will result in test users not able to login.
2016-06-07 11:13:50 +02:00
Johannes Bornhold
c58dd1646e db: Change ordering of test env setup and db connection init.
- DB init sets rhodecode.model.db.ENCRYPTION_KEY
- Test env setup resets rhodecode.model.db.ENCRYPTION_KEY to None
- Therefore DB init has to be done after test env setup.
2016-06-07 10:26:08 +02:00
Johannes Bornhold
422f825bb8 db: Move initialization of test environment up to pyramid layer. 2016-06-07 09:31:33 +02:00
Johannes Bornhold
35f714fa77 db: Move database initialization up to pyramid.
We need the DB during app setup. Therefore we have to move this up to the
make_pyramid_app function.
2016-06-06 09:05:03 +02:00
Marcin Kuzminski
7f133e9332 docs: added initial 4.1 release notes 2016-06-07 17:52:38 +02:00
Marcin Kuzminski
64fe964546 configs: updated configs for VCSServer connectivty options 2016-06-07 17:41:26 +02:00
Daniel Dourvaris
e4b83e3c9a bugfix: last line in file content highlighter was being skipped 2016-06-07 15:54:44 +03:00
Marcin Kuzminski
28bfada804 docs: update info about requirements 2016-06-07 12:52:57 +02:00
Daniel Dourvaris
a637e6b134 pkgs: update rce to use tools 0.8.0 2016-06-07 13:07:41 +03:00
Daniel Dourvaris
7a19ff9fd4 pkgs: remove pyelasticsearch dependancy 2016-06-07 12:10:08 +03:00
Johannes Bornhold
d05c4fb045 authn: Use new is_headers_auth function. 2016-06-06 10:15:00 +02:00
Johannes Bornhold
50474589c2 authn: Deprecate the is_container_auth function. 2016-06-06 10:22:42 +02:00
Johannes Bornhold
a29b8b84a5 authn: Rename 'container' -> 'headers' in authentication. 2016-06-06 10:33:01 +02:00
Johannes Bornhold
d1c5c52375 authn: Log a warning message if fallback authentication plugin is enabled in ini file. 2016-06-03 15:02:08 +02:00
Johannes Bornhold
9d4692ad5f authn: Fix container auth in login view. 2016-06-03 13:28:01 +02:00
Johannes Bornhold
0ba8db517b authn: Fix ordering of authentication plugins. 2016-06-03 12:08:55 +02:00
Johannes Bornhold
a44e92e154 authn: Fix form validation of authentication plugins.
- Check if plugin exists.
- Display an apropriate error message if it doesn't exist.
2016-06-03 11:22:13 +02:00
Daniel Dourvaris
f6ac7d1c82 admin: tweak usergroup settings ui for clarity 2016-06-06 13:08:08 +03:00
Daniel Dourvaris
be2bf30c95 permissions: show overridden permissions in permission summary page 2016-06-06 05:58:37 +03:00