diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:12:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 10:12:48 +0000 |
| commit | ca3e9b975922339b25cc7ca902c7c46e24ed1170 (patch) | |
| tree | 0223d2408634923ddfba61c3b8f20656f76981d4 /Gemfile.lock | |
| parent | 89686b90939c7dc1d6c5376d711988efd7809f13 (diff) | |
| parent | e03ebd80bb610fb106e82c4ab517c050dbd7f6a7 (diff) | |
| download | gitlab-ce-ca3e9b975922339b25cc7ca902c7c46e24ed1170.tar.gz | |
Merge branch 'blackst0ne-add-discord-service' into 'master'
Add Discord integration
Closes #21635
See merge request gitlab-org/gitlab-ce!22684
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 032de064820..d111c2cffed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,6 +162,8 @@ GEM rotp (~> 2.0) diff-lcs (1.3) diffy (3.1.0) + discordrb-webhooks-blackst0ne (3.3.0) + rest-client (~> 2.0) docile (1.1.5) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) @@ -965,6 +967,7 @@ DEPENDENCIES devise (~> 4.4) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) + discordrb-webhooks-blackst0ne (~> 3.3) doorkeeper (~> 4.3) doorkeeper-openid_connect (~> 1.5) ed25519 (~> 1.2) |