nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2018-10-08 02:58:01 +02:00
commit bb84767a96
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation # Federation
gem "diaspora_federation-json_schema", "0.2.4" gem "diaspora_federation-json_schema", "0.2.5"
gem "diaspora_federation-rails", "0.2.4" gem "diaspora_federation-rails", "0.2.5"
# API and JSON # API and JSON
@ -143,7 +143,7 @@ gem "leaflet-rails", "1.3.1"
# Parsing # Parsing
gem "nokogiri", "1.8.2" gem "nokogiri", "1.8.5"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0" gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.12.0" gem "ruby-oembed", "0.12.0"
@ -202,7 +202,7 @@ gem "logging-rails", "0.6.0", require: "logging/rails"
# Reading and writing zip files # Reading and writing zip files
gem "rubyzip", "1.2.1", require: "zip" gem "rubyzip", "1.2.2", require: "zip"
# Prevent occasions where minitest is not bundled in # Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs: # packaged versions of ruby. See following issues/prs:
@ -297,7 +297,7 @@ group :test do
gem "timecop", "0.9.1" gem "timecop", "0.9.1"
gem "webmock", "3.3.0", require: false gem "webmock", "3.3.0", require: false
gem "diaspora_federation-test", "0.2.4" gem "diaspora_federation-test", "0.2.5"
# Coverage # Coverage
gem "coveralls", "0.8.21", require: false gem "coveralls", "0.8.21", require: false

30
Gemfile.lock
View file

@ -170,18 +170,18 @@ GEM
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
diaspora-prosody-config (0.0.7) diaspora-prosody-config (0.0.7)
diaspora_federation (0.2.4) diaspora_federation (0.2.5)
faraday (>= 0.9.0, < 0.15.0) faraday (>= 0.9.0, < 0.16.0)
faraday_middleware (>= 0.10.0, < 0.13.0) faraday_middleware (>= 0.10.0, < 0.13.0)
nokogiri (~> 1.6, >= 1.6.8) nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0) typhoeus (~> 1.0)
valid (~> 1.0) valid (~> 1.0)
diaspora_federation-json_schema (0.2.4) diaspora_federation-json_schema (0.2.5)
diaspora_federation-rails (0.2.4) diaspora_federation-rails (0.2.5)
actionpack (>= 4.2, < 6) actionpack (>= 4.2, < 6)
diaspora_federation (= 0.2.4) diaspora_federation (= 0.2.5)
diaspora_federation-test (0.2.4) diaspora_federation-test (0.2.5)
diaspora_federation (= 0.2.4) diaspora_federation (= 0.2.5)
fabrication (~> 2.16) fabrication (~> 2.16)
uuid (~> 2.3, >= 2.3.8) uuid (~> 2.3, >= 2.3.8)
diff-lcs (1.3) diff-lcs (1.3)
@ -396,7 +396,7 @@ GEM
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
nio4r (2.3.0) nio4r (2.3.0)
nokogiri (1.8.2) nokogiri (1.8.5)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
@ -625,7 +625,7 @@ GEM
ruby-oembed (0.12.0) ruby-oembed (0.12.0)
ruby-progressbar (1.9.0) ruby-progressbar (1.9.0)
ruby_dep (1.5.0) ruby_dep (1.5.0)
rubyzip (1.2.1) rubyzip (1.2.2)
rufus-scheduler (3.4.2) rufus-scheduler (3.4.2)
et-orbi (~> 1.0) et-orbi (~> 1.0)
rugged (0.27.0) rugged (0.27.0)
@ -790,9 +790,9 @@ DEPENDENCIES
devise (= 4.4.3) devise (= 4.4.3)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7) diaspora-prosody-config (= 0.0.7)
diaspora_federation-json_schema (= 0.2.4) diaspora_federation-json_schema (= 0.2.5)
diaspora_federation-rails (= 0.2.4) diaspora_federation-rails (= 0.2.5)
diaspora_federation-test (= 0.2.4) diaspora_federation-test (= 0.2.5)
entypo-rails (= 3.0.0) entypo-rails (= 3.0.0)
eye (= 0.10.0) eye (= 0.10.0)
factory_girl_rails (= 4.8.0) factory_girl_rails (= 4.8.0)
@ -828,7 +828,7 @@ DEPENDENCIES
minitest minitest
mobile-fu (= 1.4.0) mobile-fu (= 1.4.0)
mysql2 (= 0.5.0) mysql2 (= 0.5.0)
nokogiri (= 1.8.2) nokogiri (= 1.8.5)
omniauth (= 1.8.1) omniauth (= 1.8.1)
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)
omniauth-twitter (= 1.4.0) omniauth-twitter (= 1.4.0)
@ -886,7 +886,7 @@ DEPENDENCIES
rspec-rails (= 3.7.2) rspec-rails (= 3.7.2)
rubocop (= 0.54.0) rubocop (= 0.54.0)
ruby-oembed (= 0.12.0) ruby-oembed (= 0.12.0)
rubyzip (= 1.2.1) rubyzip (= 1.2.2)
sass-rails (= 5.0.7) sass-rails (= 5.0.7)
secure_headers (= 5.0.5) secure_headers (= 5.0.5)
shoulda-matchers (= 3.1.2) shoulda-matchers (= 3.1.2)
@ -915,4 +915,4 @@ DEPENDENCIES
will_paginate (= 3.1.6) will_paginate (= 3.1.6)
BUNDLED WITH BUNDLED WITH
1.16.4 1.16.5