diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-16 19:32:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 19:32:47 +0200 |
| commit | 7e2e0d6dcc1adb648ac8719e933acfdc785a8b0d (patch) | |
| tree | 75105b86708c878e071695bad94ac2e7a5c44e6a | |
| parent | 181115422c8a990b1e76920a1902c2e0f3dcd85e (diff) | |
Fix #1670 - Update OStatus2 gem (#1936)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile index 0165219d3..12e783805 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem 'kaminari' gem 'link_header' gem 'nokogiri' gem 'oj' -gem 'ostatus2' +gem 'ostatus2', '~> 1.1' gem 'ox' gem 'rabl' gem 'rack-attack' diff --git a/Gemfile.lock b/Gemfile.lock index 4b4dd105c..97e5a6658 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,11 +250,13 @@ GEM nokogiri (1.7.1) mini_portile2 (~> 2.1.0) oj (2.18.5) + openssl (2.0.3) orm_adapter (0.5.0) - ostatus2 (1.0.2) + ostatus2 (1.1.0) addressable (~> 2.4) http (~> 2.0) nokogiri (~> 1.6) + openssl (~> 2.0) ox (2.4.11) paperclip (5.1.0) activemodel (>= 4.2.0) @@ -441,7 +443,7 @@ GEM execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.3) unicode-display_width (1.1.3) uniform_notifier (1.10.0) warden (1.2.7) @@ -501,7 +503,7 @@ DEPENDENCIES microformats2 nokogiri oj - ostatus2 + ostatus2 (~> 1.1) ox paperclip (~> 5.1) paperclip-av-transcoder |