diff options
| author | James Moger <james.moger@gitblit.com> | 2014-02-21 09:05:42 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-02-21 09:05:42 -0500 |
| commit | 9fcd4fa469c4154a6f5f82d08877336a5114e538 (patch) | |
| tree | 19436ed952268a73f55a85dca3dc5275b07b6bcf | |
| parent | 5f5ceaa47a64a032693f3b9b9cc3f0a2ed157c2e (diff) | |
| download | gitblit-9fcd4fa469c4154a6f5f82d08877336a5114e538.tar.gz gitblit-9fcd4fa469c4154a6f5f82d08877336a5114e538.zip | |
Remove admin permission setting from Redmine auth provider (issue-368)
This feature depended on an undocumented behavior of Redmine. If/when
Redmine groups are mapped to Gitblit teams, we can reconsider setting
the admin permission (issue-321).
| -rw-r--r-- | releases.moxie | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/auth/RedmineAuthProvider.java | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/releases.moxie b/releases.moxie index 65487139..a5339778 100644 --- a/releases.moxie +++ b/releases.moxie @@ -21,6 +21,7 @@ r20: { - Fixed NPE when attempting to add a permission without a registrant (issue-344) - Invalidate all cached repository data on "clear cache" (issue-346) - Fix chart failures when an apostrophe is in a user display name (issue-350, pr-128) + - Stop setting admin permission based on undocumented Redmine REST API behavior (issue-368) - Fix support url decoding with non-ascii characters (pr-136) - Fix potential NPE on removing uncached repository from cache - Ignore the default contents of .git/description file diff --git a/src/main/java/com/gitblit/auth/RedmineAuthProvider.java b/src/main/java/com/gitblit/auth/RedmineAuthProvider.java index 04adc459..7e957ecb 100644 --- a/src/main/java/com/gitblit/auth/RedmineAuthProvider.java +++ b/src/main/java/com/gitblit/auth/RedmineAuthProvider.java @@ -134,11 +134,6 @@ public class RedmineAuthProvider extends UsernamePasswordAuthenticationProvider user.displayName = current.user.firstname + " " + current.user.lastname; user.emailAddress = current.user.mail; user.password = Constants.EXTERNAL_ACCOUNT; - if (!StringUtils.isEmpty(current.user.login)) { - // only admin users can get login name - // evidently this is an undocumented behavior of Redmine - user.canAdmin = true; - } // TODO consider Redmine group mapping for team membership // http://www.redmine.org/projects/redmine/wiki/Rest_Users |