diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
| commit | 4c1fd9a19c779fa6e7d74513c61f37ce05a841b3 (patch) | |
| tree | 0cf23810e2f7ff0f45c65a3f2f9b35016587c68a /Gemfile.lock | |
| parent | ad3a2dfb66abc01a90807f23191b7e28c3c242ed (diff) | |
| parent | 33f56811e38bc330de9dcfa6794c29a176a30311 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5f291d46a..d8a853b04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,6 +137,9 @@ GEM devise (~> 4.0) railties (< 5.2) rotp (~> 2.0) + devise_pam_authenticatable2 (8.0.1) + devise (>= 4.0.0) + rpam2 (~> 3.0) diff-lcs (1.3) docile (1.1.5) domain_name (0.5.20170404) @@ -215,7 +218,7 @@ GEM httplog (0.99.7) colorize rack - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) i18n-tasks (0.9.19) activesupport (>= 4.0.2) @@ -284,7 +287,7 @@ GEM mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) + minitest (5.11.3) msgpack (1.1.0) multi_json (1.12.2) net-scp (1.2.1) @@ -307,7 +310,7 @@ GEM http (~> 3.0) nokogiri (~> 1.8) ox (2.8.2) - paperclip (5.1.0) + paperclip (5.2.1) activemodel (>= 4.2.0) activesupport (>= 4.2.0) cocaine (~> 0.5.5) @@ -421,6 +424,7 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) rotp (2.1.2) + rpam2 (3.1.0) rqrcode (0.10.1) chunky_png (~> 1.0) rspec-core (3.7.0) @@ -571,6 +575,7 @@ DEPENDENCIES climate_control (~> 0.2) devise (~> 4.4) devise-two-factor (~> 3.0) + devise_pam_authenticatable2 (~> 8.0) doorkeeper (~> 4.2) dotenv-rails (~> 2.2) fabrication (~> 2.18) |