diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-08 19:05:02 -0500 |
| commit | 67e77f230e93b2e2ac05632a7cccdb5f26537f3b (patch) | |
| tree | 6fd9801a67dc1576e5711177fdeeac04f2622098 /Gemfile | |
| parent | 695b53b796767e307d8ce0f5d11c2a82cb85bfd5 (diff) | |
| parent | 0893b1669548858daee79ab1260fb98646a0b3fa (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile index 9ab7e046c..03ffd49ec 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,7 @@ gem 'devise-two-factor', '~> 3.0' group :pam_authentication, optional: true do gem 'devise_pam_authenticatable2', '~> 9.0' end + gem 'net-ldap', '~> 0.10' gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' @@ -81,6 +82,7 @@ gem 'sidekiq-bulk', '~>0.1.1' gem 'simple-navigation', '~> 4.0' gem 'simple_form', '~> 3.4' gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' +gem 'stoplight', '~> 2.1.3' gem 'strong_migrations' gem 'tty-command' gem 'tty-prompt' |