Unverified Commit d8c1b4f4 authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge branch 'release/0.7.7.0'

parents 2b3bbc1a af3e2e6d

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ tmp/ 
.byebug_history

.sass-cache/

.DS_Store

.idea

.redcar

.stgit*

*.swap
@@ -73,6 +72,8 @@ capybara-*.html 
*.rbc



# IDE

.idea

.vscode

diaspora.iml



# Dolphin's directory's preferences files

Changelog.md

+16 −0
Original line number Diff line number Diff line 
# 0.7.7.0



## Refactor

* Remove mention of deprecated `statistic.json` [#7867](https://github.com/diaspora/diaspora/pull/7867)

* Add quotes in `database.yml.example` to fields that may contain special characters [#7875](https://github.com/diaspora/diaspora/pull/7875)

* Removed broken, and thus deprecated, Facebook integration [#7874](https://github.com/diaspora/diaspora/pull/7874)



## Bug fixes

* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)

* Fix comment and like notifications on posts without text [#7857](https://github.com/diaspora/diaspora/pull/7857) [#7853](https://github.com/diaspora/diaspora/pull/7853)

* Fix issue with some language fallbacks not working correctly [#7861](https://github.com/diaspora/diaspora/pull/7861)

* Make sure URLs are encoded before sending them to camo [#7871](https://github.com/diaspora/diaspora/pull/7871)



## Features

* Add `web+diaspora://` link handler [#7826](https://github.com/diaspora/diaspora/pull/7826)



# 0.7.6.0



## Refactor

Gemfile

+7 −8
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ gem "unicorn-worker-killer", "0.4.4" 


# Federation



gem "diaspora_federation-json_schema", "0.2.4"

gem "diaspora_federation-rails", "0.2.4"

gem "diaspora_federation-json_schema", "0.2.5"

gem "diaspora_federation-rails", "0.2.5"



# API and JSON
@@ -140,7 +140,7 @@ gem "leaflet-rails", "1.3.1" 


# 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 "redcarpet",         "3.4.0"

gem "ruby-oembed",       "0.12.0"
@@ -157,14 +157,13 @@ gem "secure_headers", "5.0.5" 
# Services



gem "omniauth",           "1.8.1"

gem "omniauth-facebook",  "4.0.0"

gem "omniauth-tumblr",    "1.2"

gem "omniauth-twitter",   "1.4.0"

gem "omniauth-wordpress", "0.2.2"

gem "twitter",            "6.2.0"



# OpenID Connect

gem "openid_connect", "1.1.5"

gem "openid_connect", "1.1.6"



# Serializers
@@ -200,7 +199,7 @@ gem "logging-rails", "0.6.0", require: "logging/rails" 


# 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

# packaged versions of ruby. See following issues/prs:
@@ -275,7 +274,7 @@ end 
group :test do

  # RSpec (unit tests, some integration tests)



  gem "fixture_builder",   "0.5.1"

  gem "fixture_builder",   "0.5.2.rc3"

  gem "fuubar",            "2.3.1"

  gem "json-schema-rspec", "0.0.4"

  gem "rspec-json_expectations", "~> 2.1"
@@ -295,7 +294,7 @@ group :test do 
  gem "timecop",            "0.9.1"

  gem "webmock",            "3.3.0", require: false



  gem "diaspora_federation-test", "0.2.4"

  gem "diaspora_federation-test", "0.2.5"



  # Coverage

  gem "coveralls", "0.8.21", require: false

Gemfile.lock

+27 −33
Original line number Diff line number Diff line
@@ -166,18 +166,18 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.7)

    diaspora_federation (0.2.4)

      faraday (>= 0.9.0, < 0.15.0)

    diaspora_federation (0.2.5)

      faraday (>= 0.9.0, < 0.16.0)

      faraday_middleware (>= 0.10.0, < 0.13.0)

      nokogiri (~> 1.6, >= 1.6.8)

      typhoeus (~> 1.0)

      valid (~> 1.0)

    diaspora_federation-json_schema (0.2.4)

    diaspora_federation-rails (0.2.4)

    diaspora_federation-json_schema (0.2.5)

    diaspora_federation-rails (0.2.5)

      actionpack (>= 4.2, < 6)

      diaspora_federation (= 0.2.4)

    diaspora_federation-test (0.2.4)

      diaspora_federation (= 0.2.4)

      diaspora_federation (= 0.2.5)

    diaspora_federation-test (0.2.5)

      diaspora_federation (= 0.2.5)

      fabrication (~> 2.16)

      uuid (~> 2.3, >= 2.3.8)

    diff-lcs (1.3)
@@ -217,10 +217,11 @@ GEM 
      http-cookie (~> 1.0.0)

    faraday_middleware (0.12.2)

      faraday (>= 0.7.4, < 1.0)

    ffi (1.9.23)

    fixture_builder (0.5.1)

    ffi (1.9.25)

    fixture_builder (0.5.2.rc3)

      activerecord (>= 2)

      activesupport (>= 2)

      hashdiff

    fog-aws (2.0.1)

      fog-core (~> 1.38)

      fog-json (~> 1.0)
@@ -305,7 +306,7 @@ GEM 
    httparty (0.16.2)

      multi_xml (>= 0.5.2)

    httpclient (2.8.3)

    i18n (1.0.0)

    i18n (1.1.0)

      concurrent-ruby (~> 1.0)

    i18n-inflector (2.6.7)

      i18n (>= 0.4.1)
@@ -332,12 +333,10 @@ GEM 
      rails (>= 4.0, < 6.0)

      sprockets (>= 3.0.0)

    json (2.1.0)

    json-jwt (1.9.2)

    json-jwt (1.9.4)

      activesupport

      aes_key_wrap

      bindata

      securecompare

      url_safe_base64

    json-schema (2.8.0)

      addressable (>= 2.4)

    json-schema-rspec (0.0.4)
@@ -378,7 +377,7 @@ GEM 
      mime-types-data (~> 3.2015)

    mime-types-data (3.2016.0521)

    mini_magick (4.8.0)

    mini_mime (1.0.0)

    mini_mime (1.0.1)

    mini_portile2 (2.3.0)

    minitest (5.11.3)

    mobile-fu (1.4.0)
@@ -392,7 +391,7 @@ GEM 
    naught (1.1.0)

    nenv (0.3.0)

    nio4r (2.3.0)

    nokogiri (1.8.2)

    nokogiri (1.8.5)

      mini_portile2 (~> 2.3.0)

    notiffany (0.1.1)

      nenv (~> 0.1)
@@ -409,8 +408,6 @@ GEM 
    omniauth (1.8.1)

      hashie (>= 3.4.6, < 3.6.0)

      rack (>= 1.6.2, < 3)

    omniauth-facebook (4.0.0)

      omniauth-oauth2 (~> 1.2)

    omniauth-oauth (1.1.0)

      oauth

      omniauth (~> 1.0)
@@ -428,7 +425,7 @@ GEM 
    open_graph_reader (0.6.2)

      faraday (>= 0.9.0)

      nokogiri (~> 1.6)

    openid_connect (1.1.5)

    openid_connect (1.1.6)

      activemodel

      attr_required (>= 1.0.0)

      json-jwt (>= 1.5.0)
@@ -474,7 +471,7 @@ GEM 
    pry-byebug (3.6.0)

      byebug (~> 10.0)

      pry (~> 0.10)

    public_suffix (3.0.2)

    public_suffix (3.0.3)

    rack (2.0.5)

    rack-cors (1.0.2)

    rack-google-analytics (1.2.0)
@@ -482,7 +479,7 @@ GEM 
      activesupport

    rack-mobile-detect (0.4.0)

      rack

    rack-oauth2 (1.9.1)

    rack-oauth2 (1.9.2)

      activesupport

      attr_required

      httpclient
@@ -621,7 +618,7 @@ GEM 
    ruby-oembed (0.12.0)

    ruby-progressbar (1.9.0)

    ruby_dep (1.5.0)

    rubyzip (1.2.1)

    rubyzip (1.2.2)

    rufus-scheduler (3.4.2)

      et-orbi (~> 1.0)

    rugged (0.27.0)
@@ -641,7 +638,6 @@ GEM 
      sass (~> 3.4.20)

    secure_headers (5.0.5)

      useragent (>= 0.15.0)

    securecompare (1.0.0)

    shellany (0.0.1)

    shoulda-matchers (3.1.2)

      activesupport (>= 4.0.0)
@@ -720,14 +716,13 @@ GEM 
    unf (0.1.4)

      unf_ext

    unf_ext (0.0.7.5)

    unicode-display_width (1.3.0)

    unicode-display_width (1.4.0)

    unicorn (5.4.0)

      kgio (~> 2.6)

      raindrops (~> 0.7)

    unicorn-worker-killer (0.4.4)

      get_process_mem (~> 0)

      unicorn (>= 4, < 6)

    url_safe_base64 (0.2.2)

    useragent (0.16.10)

    uuid (2.3.8)

      macaddr (~> 1.0)
@@ -783,16 +778,16 @@ DEPENDENCIES 
  devise (= 4.4.3)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.7)

  diaspora_federation-json_schema (= 0.2.4)

  diaspora_federation-rails (= 0.2.4)

  diaspora_federation-test (= 0.2.4)

  diaspora_federation-json_schema (= 0.2.5)

  diaspora_federation-rails (= 0.2.5)

  diaspora_federation-test (= 0.2.5)

  entypo-rails (= 3.0.0)

  eye (= 0.10.0)

  factory_girl_rails (= 4.8.0)

  faraday (= 0.12.2)

  faraday-cookie_jar (= 0.0.6)

  faraday_middleware (= 0.12.2)

  fixture_builder (= 0.5.1)

  fixture_builder (= 0.5.2.rc3)

  fog-aws (= 2.0.1)

  fuubar (= 2.3.1)

  gon (= 6.2.0)
@@ -821,14 +816,13 @@ DEPENDENCIES 
  minitest

  mobile-fu (= 1.4.0)

  mysql2 (= 0.5.0)

  nokogiri (= 1.8.2)

  nokogiri (= 1.8.5)

  omniauth (= 1.8.1)

  omniauth-facebook (= 4.0.0)

  omniauth-tumblr (= 1.2)

  omniauth-twitter (= 1.4.0)

  omniauth-wordpress (= 0.2.2)

  open_graph_reader (= 0.6.2)

  openid_connect (= 1.1.5)

  openid_connect (= 1.1.6)

  pg (= 1.0.0)

  poltergeist (= 1.17.0)

  pronto (= 0.9.5)
@@ -878,7 +872,7 @@ DEPENDENCIES 
  rspec-rails (= 3.7.2)

  rubocop (= 0.54.0)

  ruby-oembed (= 0.12.0)

  rubyzip (= 1.2.1)

  rubyzip (= 1.2.2)

  sass-rails (= 5.0.7)

  secure_headers (= 5.0.5)

  shoulda-matchers (= 3.1.2)
@@ -906,4 +900,4 @@ DEPENDENCIES 
  will_paginate (= 3.1.6)



BUNDLED WITH

   1.16.2
 
   1.16.5

app/assets/images/social-media-logos/facebook-16x16.png

deleted100644 → 0
−307 B
Loading image diff...