Martin Bornhold
74d78fdec3
oss-licenses: Remove pylons view.
2016-06-15 12:06:49 +02:00
Johannes Bornhold
efce0bcdb0
templates: Only display license as link when URL is set.
2016-06-10 15:19:48 +02:00
Johannes Bornhold
4e9923b5ae
auth: Implement __str__ on plugin base class
...
This way some error messages will look nicer, since they are based on the
__str__ of the plugin instance. Using the plugin_id will give the user (and us
in the support case) the exact pointer to the affected plugins.
2016-06-16 09:11:45 +02:00
Marcin Kuzminski
0e8804b8e5
release: remove newline from version file
2016-06-15 10:34:11 +02:00
Marcin Kuzminski
eca8a89717
release: Merge stable into default
2016-06-15 03:01:27 +02:00
Marcin Kuzminski
ab5316a2b3
release: Start preparation for 4.1.1
2016-06-15 02:29:27 +02:00
Martin Bornhold
3bd01810b3
permissions: Fix permissions for authentication plugin settings view.
2016-06-14 12:30:42 +02:00
Daniel Dourvaris
a025a9c3f6
errorpages: add appenlight to pyramid layer
2016-06-14 13:13:36 +03:00
Daniel Dourvaris
cb75973073
errorpages: convert general exceptions to error page if toolbar disabled
2016-06-14 12:02:49 +03:00
Daniel Dourvaris
ad8747e7bf
tests: fix disable_vcs tests
2016-06-14 10:40:02 +03:00
Daniel Dourvaris
38021f6a30
errorpages: convert webob responses better, include status text + headers
2016-06-14 10:00:01 +03:00
Daniel Dourvaris
c17c69173b
errorpages: use original http status for rendered error page
2016-06-14 08:27:18 +03:00
Marcin Kuzminski
996239fa3f
pull-requests: add a success flash when PR was merged
2016-06-10 09:55:21 +02:00
Daniel Dourvaris
fc0551b617
pullrequests: force ajax request to not use browser cache fixes #4002
2016-06-09 16:20:29 +03:00
Daniel Dourvaris
bf2e56d06f
bugfix: missing import
2016-06-09 15:38:48 +03:00
lisaq
2937a9a353
styling: fixes #4001 strikethrough on pr reviewer deletion
2016-06-09 11:41:45 +02: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
Daniel Dourvaris
e624141d32
tests: fix admin users groups tests
2016-06-09 07:41:46 +03:00
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
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
Daniel Dourvaris
71a0c66f67
cleanup: remove unused library
2016-06-08 18:25:45 +03:00
Daniel Dourvaris
18573c588d
cleanup: remove accidental additions
2016-06-08 15:45:30 +03: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
Daniel Dourvaris
fdcf88bd53
pyramid: make responses/exceptions from pyramid/pylons work
2016-06-08 15:21:58 +03:00
Marcin Kuzminski
d6e940710d
release: Bump version 4.1.0 to 4.2.0
2016-06-12 21:00:43 +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
Johannes Bornhold
ec516d16f1
db: Move db setup code to seperate function.
2016-06-07 17:17:28 +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