hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1670 - Update OStatus2 gem (#1936)

signup-info-prompt
Eugen 2017-04-16 19:32:47 +02:00 committed by GitHub
parent 181115422c
commit 7e2e0d6dcc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -37,7 +37,7 @@ gem 'kaminari'
gem 'link_header' gem 'link_header'
gem 'nokogiri' gem 'nokogiri'
gem 'oj' gem 'oj'
gem 'ostatus2' gem 'ostatus2', '~> 1.1'
gem 'ox' gem 'ox'
gem 'rabl' gem 'rabl'
gem 'rack-attack' gem 'rack-attack'

8
Gemfile.lock
View File

@ -250,11 +250,13 @@ GEM
nokogiri (1.7.1) nokogiri (1.7.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
oj (2.18.5) oj (2.18.5)
openssl (2.0.3)
orm_adapter (0.5.0) orm_adapter (0.5.0)
ostatus2 (1.0.2) ostatus2 (1.1.0)
addressable (~> 2.4) addressable (~> 2.4)
http (~> 2.0) http (~> 2.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
openssl (~> 2.0)
ox (2.4.11) ox (2.4.11)
paperclip (5.1.0) paperclip (5.1.0)
activemodel (>= 4.2.0) activemodel (>= 4.2.0)
@ -441,7 +443,7 @@ GEM
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.2) unf_ext (0.0.7.3)
unicode-display_width (1.1.3) unicode-display_width (1.1.3)
uniform_notifier (1.10.0) uniform_notifier (1.10.0)
warden (1.2.7) warden (1.2.7)
@ -501,7 +503,7 @@ DEPENDENCIES
microformats2 microformats2
nokogiri nokogiri
oj oj
ostatus2 ostatus2 (~> 1.1)
ox ox
paperclip (~> 5.1) paperclip (~> 5.1)
paperclip-av-transcoder paperclip-av-transcoder