diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2018-08-01 12:16:42 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-08-01 12:47:30 +1000 |
| commit | 2bdf08e732ad5d959bfebd222e58a7cd4a4971eb (patch) | |
| tree | 1676c34376205ace5088b34c4a124c86ca7f8d9e /lib/actor.rb | |
| parent | a686b9a0ee4c180b272b26e45c9a2c6cb84c742c (diff) | |
| parent | e3fead94b6f71d3501d586cbb2295ea0d1da2b31 (diff) | |
| download | gitlab-shell-2bdf08e732ad5d959bfebd222e58a7cd4a4971eb.tar.gz | |
Merge remote-tracking branch 'origin/master' into ash.mckenzie/srp-refactor
Diffstat (limited to 'lib/actor.rb')
| -rw-r--r-- | lib/actor.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/actor.rb b/lib/actor.rb index eab1bc4..4e8b3b8 100644 --- a/lib/actor.rb +++ b/lib/actor.rb @@ -1,6 +1,7 @@ require_relative 'actor/base' require_relative 'actor/key' require_relative 'actor/user' +require_relative 'actor/username' module Actor class UnsupportedActorError < StandardError; end @@ -11,6 +12,8 @@ module Actor Key.from(str, audit_usernames: audit_usernames) when User.id_regex User.from(str, audit_usernames: audit_usernames) + when Username.id_regex + Username.from(str, audit_usernames: audit_usernames) else raise UnsupportedActorError end |