diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-30 23:32:30 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-30 23:32:30 +0000 |
commit | 2f8d8dca22eca9937cee14765ceadc2aee266616 (patch) | |
tree | 1b5142eaedf21ebe5c6911e30e0e99d2833620e0 /app/services/members | |
parent | 4d243f5ca3709f28f9de96937e3c2ac736deb4bd (diff) | |
download | gitlab-ce-2f8d8dca22eca9937cee14765ceadc2aee266616.tar.gz |
Add latest changes from gitlab-org/security/gitlab@13-4-stable-ee
Diffstat (limited to 'app/services/members')
-rw-r--r-- | app/services/members/base_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/members/base_service.rb b/app/services/members/base_service.rb index 5d69418fb7d..3f55f661d9b 100644 --- a/app/services/members/base_service.rb +++ b/app/services/members/base_service.rb @@ -7,6 +7,11 @@ module Members def initialize(current_user = nil, params = {}) @current_user = current_user @params = params + + # could be a string, force to an integer, part of fix + # https://gitlab.com/gitlab-org/gitlab/-/issues/219496 + # Allow the ArgumentError to be raised if it can't be converted to an integer. + @params[:access_level] = Integer(@params[:access_level]) if @params[:access_level] end def after_execute(args) |