Commit graph

34 commits

Author SHA1 Message Date
Martin Bornhold
77c3287d4a settings: Delete obsolete code related to the rebase-merge lab settings. 2016-06-27 16:53:36 +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
b3a1dec11e settings: Add the 'rebase-merge' setting to VCS base form and VCS settings model. 2016-06-27 11:00:22 +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
4915a005dc scm: clear the cs cache on delete/remap 2016-07-01 14:17:50 +03: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
0e916f338a user: indicate missing super admin or default as fatal errors. 2016-06-28 01:25:33 +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
a51519ed0a encryption: use common method to fetch encryption key for encrypted fields. 2016-06-23 13:48:11 +02:00
Marcin Kuzminski
e0266a9130 settings: use cache on whole result not just the query since it's the computation
of values that is slow not the query itself.
2016-06-23 11:51:41 +02:00
Marcin Kuzminski
56c24af7bc caches: use optional identity cache options on get_by_repo_name and get_by_username
methods. Disabled by now.
2016-06-22 20:38:44 +02:00
Daniel Dourvaris
f43669f817 model: log exception if multiple repos rather than hard error 2016-06-22 18:29:41 +03:00
Daniel Dourvaris
114e4097ca model: make sure only 1 repo in session when get_by_repo_name 2016-06-22 18:18:59 +03:00
Daniel Dourvaris
6f322f3be9 speedup: join repo on fork/user/group by default 2016-06-22 14:58:05 +03:00
Daniel Dourvaris
c00cc3ef14 speedup: check identity_map when getting by repo name 2016-06-22 13:38:11 +03:00
Daniel Dourvaris
450bb8142e speedup: check local session for repo by repo name first 2016-06-22 12:53:43 +03:00
Johannes Bornhold
23ac9de853 events: Send events when user is created or updated.
Send the UserPreCreate event before a new user is created.
Send the UserPreUpdate event before a user is updated.
2016-05-31 12:36:58 +02:00
Johannes Bornhold
3cc0e271b6 events: Add a method to model base class for sending events.
This wraps the logic to send pyramid events at a single place.
2016-05-31 12:34:42 +02:00
Marcin Kuzminski
2687022328 repos, repo groups, user groups: allow to use disabled users in owner field.
This fixes #3374. There's no good benefit of having possibility to prevent
setting disabled user from beeing an owner.
It can happen that we start preperating a system and use disabled accounts.
Also users shouldn't be forbidden to edit settings on an disabled owner.
2016-06-18 02:03:43 +02:00
Marcin Kuzminski
0276305290 autocomplete: add flags to show/hide active users, and also display this information
in autocomplete data.

ref #3374
2016-06-18 14:23:57 +02:00
Johannes Bornhold
e756b3e5f4 hg: Log original exception when doing the merge with rebase. 2016-06-09 12:04:59 +02:00
Johannes Bornhold
ebec853ea6 pull_request: Increase debug logging around merge. 2016-06-09 00:19:16 +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
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
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
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
4d64b68627 bugfix: santize wouldnt allow files starting with . - fixes #3936 2016-06-02 16:20:13 +03:00
Marcin Kuzminski
cba71c524a logging: improve how we log user lookup 2016-06-03 01:07:00 +02:00
Daniel Dourvaris
8f434d0117 search: sort commit messages by date rather than revision 2016-06-02 15:17:46 +03:00
Daniel Dourvaris
9354185a44 bugfix: fixed #3965 and updated a bunch of api tests which
were not actually testing their return values properly
2016-06-01 20:11:27 +03:00
Johannes Bornhold
b7a3eecf07 login: Fix password reset mail link.
- Pyramid needs the request object to generate an URL.
- Therefore we generate the URL in the view and pass it to the model
  to send the email.
2016-05-25 12:10:24 +02:00
Daniel Dourvaris
a31dc2a19e pullrequests: select a ref if one exists matching the commit id 2016-05-24 19:21:56 +03:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00