Unverified Commit 7aadadce authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.6.6.0'

parents 91a9549c f5905586

.rubocop.yml

+10 −0
Original line number Diff line number Diff line
@@ -164,6 +164,16 @@ Lint/Debugger: 
Style/NumericPredicate:

  EnforcedStyle: comparison



# Old defaults from rubocop < 0.48.1

Style/PercentLiteralDelimiters:

  PreferredDelimiters:

    default: '()'

    '%i': '()'

    '%I': '()'

    '%r': '{}'

    '%w': '()'

    '%W': '()'



# Reset some HoundCI changes back to Rubocop defaults

Style/DotPosition:

  EnforcedStyle: leading

Changelog.md

+17 −0
Original line number Diff line number Diff line 
# 0.6.6.0



## Refactor

* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)

* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)



## Bug fixes

* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)

* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)

* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)

* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)

* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)



## Features



* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)



# 0.6.5.0



## Refactor

Gemfile

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


# Federation



gem "diaspora_federation-rails", "0.1.8"

gem "diaspora_federation-rails", "0.1.9"



# API and JSON
@@ -132,7 +132,7 @@ gem "leaflet-rails", "0.7.7" 


# Parsing



gem "nokogiri",          "1.7.1"

gem "nokogiri",          "1.7.2"

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.10.1"
@@ -183,8 +183,8 @@ gem "typhoeus", "1.1.2" 
gem "gon",                     "6.1.0"

gem "hamlit",                  "2.8.0"

gem "mobile-fu",               "1.3.1"

gem "rails-timeago",           "2.16.0"

gem "will_paginate",           "3.1.5"

gem "rails-timeago",           "2.11.0"



# Logging
@@ -217,10 +217,6 @@ gem "thor", "0.19.1" 
# gem "therubyracer", :platform => :ruby



group :production do # we don"t install these on travis to speed up test runs

  # Administration



  gem "rails_admin", "0.8.1"



  # Analytics



  gem "rack-google-analytics", "1.2.0"
@@ -250,13 +246,13 @@ group :development do 
  gem "rb-inotify",     "0.9.8", require: false



  # Linters

  gem "haml_lint",      "0.21.0"

  gem "pronto",         "0.8.2"

  gem "pronto-eslint",  "0.8.0"

  gem "pronto-haml",    "0.8.0"

  gem "pronto-rubocop", "0.8.0"

  gem "pronto-scss",    "0.8.0", require: false

  gem "rubocop",        "0.47.1"

  gem "haml_lint",      "0.24.0", require: false

  gem "pronto",         "0.9.3", require: false

  gem "pronto-eslint",  "0.9.1", require: false

  gem "pronto-haml",    "0.9.0", require: false

  gem "pronto-rubocop", "0.9.0", require: false

  gem "pronto-scss",    "0.9.1", require: false

  gem "rubocop",        "0.48.1", require: false



  # Preloading environment
@@ -296,7 +292,7 @@ group :test do 
  gem "webmock",            "2.3.2", require: false

  gem "shoulda-matchers",   "3.1.1"



  gem "diaspora_federation-test", "0.1.8"

  gem "diaspora_federation-test", "0.1.9"



  # Coverage

  gem 'coveralls', require: false

Gemfile.lock

+45 −76
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ GEM 
    chunky_png (1.3.8)

    cliver (0.3.2)

    coderay (1.1.1)

    coffee-rails (4.2.1)

      coffee-script (>= 2.2.0)

      railties (>= 4.0.0, < 5.2.x)

    coffee-script (2.4.1)

      coffee-script-source

      execjs

    coffee-script-source (1.12.2)

    compass (1.0.3)

      chunky_png (~> 1.2)

      compass-core (~> 1.0.2)
@@ -170,17 +163,17 @@ GEM 
      devise

      rails (>= 3.0.4)

    diaspora-prosody-config (0.0.7)

    diaspora_federation (0.1.8)

    diaspora_federation (0.1.9)

      faraday (>= 0.9.0, < 0.12.0)

      faraday_middleware (>= 0.10.0, < 0.12.0)

      nokogiri (~> 1.6, >= 1.6.8)

      typhoeus (~> 1.0)

      valid (~> 1.0)

    diaspora_federation-rails (0.1.8)

      diaspora_federation (= 0.1.8)

    diaspora_federation-rails (0.1.9)

      diaspora_federation (= 0.1.9)

      rails (>= 4.2, < 6)

    diaspora_federation-test (0.1.8)

      diaspora_federation (= 0.1.8)

    diaspora_federation-test (0.1.9)

      diaspora_federation (= 0.1.9)

      factory_girl (~> 4.7)

      uuid (~> 2.3.8)

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

    faraday_middleware (0.11.0.1)

      faraday (>= 0.7.4, < 1.0)

    ffi (1.9.17)

    ffi (1.9.18)

    fixture_builder (0.4.1)

      activerecord (>= 2)

      activesupport (>= 2)
@@ -236,17 +229,15 @@ GEM 
    fog-xml (0.1.2)

      fog-core

      nokogiri (~> 1.5, >= 1.5.11)

    font-awesome-rails (4.7.0.1)

      railties (>= 3.2, < 5.1)

    formatador (0.2.5)

    fuubar (2.2.0)

      rspec-core (~> 3.0)

      ruby-progressbar (~> 1.4)

    get_process_mem (0.2.1)

    gherkin (4.0.0)

    gitlab (3.7.0)

      httparty (~> 0.13.0)

      terminal-table

    gitlab (4.0.0)

      httparty

      terminal-table (= 1.7.1)

    globalid (0.3.7)

      activesupport (>= 4.1.0)

    gon (6.1.0)
@@ -277,8 +268,9 @@ GEM 
      rubocop (~> 0.20)

    haml (4.0.7)

      tilt

    haml_lint (0.21.0)

      haml (~> 4.0)

    haml_lint (0.24.0)

      haml (>= 4.0, < 5.1)

      rainbow

      rake (>= 10, < 13)

      rubocop (>= 0.47.0)

      sysexits (~> 1.1)
@@ -305,8 +297,7 @@ GEM 
    http-form_data (1.0.1)

    http_accept_language (2.1.0)

    http_parser.rb (0.6.0)

    httparty (0.13.7)

      json (~> 1.8)

    httparty (0.14.0)

      multi_xml (>= 0.5.2)

    httpclient (2.8.3)

    i18n (0.8.1)
@@ -347,9 +338,6 @@ GEM 
    jsonpath (0.5.8)

      multi_json

    jwt (1.5.6)

    kaminari (0.17.0)

      actionpack (>= 3.0.0)

      activesupport (>= 3.0.0)

    kgio (2.11.0)

    leaflet-rails (0.7.7)

    listen (3.1.5)
@@ -390,9 +378,8 @@ GEM 
    mysql2 (0.4.5)

    naught (1.1.0)

    nenv (0.3.0)

    nested_form (0.3.2)

    nio4r (2.0.0)

    nokogiri (1.7.1)

    nokogiri (1.7.2)

      mini_portile2 (~> 2.1.0)

    notiffany (0.1.1)

      nenv (~> 0.1)
@@ -404,7 +391,7 @@ GEM 
      multi_json (~> 1.3)

      multi_xml (~> 0.5)

      rack (>= 1.2, < 3)

    octokit (4.6.2)

    octokit (4.7.0)

      sawyer (~> 0.8.0, >= 0.5.3)

    omniauth (1.4.2)

      hashie (>= 1.2, < 4)
@@ -449,24 +436,24 @@ GEM 
      cliver (~> 0.3.1)

      websocket-driver (>= 0.2.0)

    powerpack (0.1.1)

    pronto (0.8.2)

      gitlab (~> 3.6, >= 3.4.0)

    pronto (0.9.3)

      gitlab (~> 4.0, >= 4.0.0)

      httparty (>= 0.13.7, < 0.15)

      octokit (~> 4.3, >= 4.1.0)

      octokit (~> 4.7, >= 4.7.0)

      rainbow (~> 2.1)

      rugged (~> 0.24, >= 0.23.0)

      thor (~> 0.19.0)

    pronto-eslint (0.8.0)

    pronto-eslint (0.9.1)

      eslintrb (~> 2.0, >= 2.0.0)

      pronto (~> 0.8.0)

    pronto-haml (0.8.0)

      haml_lint (~> 0.16, >= 0.15.0)

      pronto (~> 0.8.0)

    pronto-rubocop (0.8.0)

      pronto (~> 0.8.0)

      pronto (~> 0.9.0)

    pronto-haml (0.9.0)

      haml_lint (~> 0.23)

      pronto (~> 0.9.0)

    pronto-rubocop (0.9.0)

      pronto (~> 0.9.0)

      rubocop (~> 0.38, >= 0.35.0)

    pronto-scss (0.8.0)

      pronto (~> 0.8.0)

    pronto-scss (0.9.1)

      pronto (~> 0.9.0)

      scss_lint (~> 0.43, >= 0.43.0)

    pry (0.10.4)

      coderay (~> 1.1.0)
@@ -492,9 +479,6 @@ GEM 
      multi_json (>= 1.3.6)

      rack (>= 1.1)

    rack-piwik (0.3.0)

    rack-pjax (0.8.0)

      nokogiri (~> 1.5)

      rack (~> 1.1)

    rack-protection (1.5.3)

      rack

    rack-rewrite (1.5.1)
@@ -568,29 +552,16 @@ GEM 
    rails-i18n (4.0.8)

      i18n (~> 0.7)

      railties (~> 4.0)

    rails-timeago (2.11.0)

    rails-timeago (2.16.0)

      actionpack (>= 3.1)

      activesupport (>= 3.1)

    rails_admin (0.8.1)

      builder (~> 3.1)

      coffee-rails (~> 4.0)

      font-awesome-rails (>= 3.0, < 5)

      haml (~> 4.0)

      jquery-rails (>= 3.0, < 5)

      jquery-ui-rails (~> 5.0)

      kaminari (~> 0.14)

      nested_form (~> 0.3)

      rack-pjax (~> 0.7)

      rails (~> 4.0)

      remotipart (~> 1.0)

      safe_yaml (~> 1.0)

      sass-rails (>= 4.0, < 6)

    railties (4.2.8)

      actionpack (= 4.2.8)

      activesupport (= 4.2.8)

      rake (>= 0.8.7)

      thor (>= 0.18.1, < 2.0)

    rainbow (2.2.1)

    rainbow (2.2.2)

      rake

    raindrops (0.17.0)

    rake (12.0.0)

    rb-fsevent (0.9.8)
@@ -600,7 +571,6 @@ GEM 
    redis (3.3.3)

    redis-namespace (1.5.3)

      redis (~> 3.0, >= 3.0.4)

    remotipart (1.3.1)

    request_store (1.3.2)

    responders (2.3.0)

      railties (>= 4.2.0, < 5.1)
@@ -625,7 +595,7 @@ GEM 
      rspec-mocks (~> 3.5.0)

      rspec-support (~> 3.5.0)

    rspec-support (3.5.0)

    rubocop (0.47.1)

    rubocop (0.48.1)

      parser (>= 2.3.3.1, < 3.0)

      powerpack (~> 0.1)

      rainbow (>= 1.99.1, < 3.0)
@@ -649,7 +619,7 @@ GEM 
    sawyer (0.8.1)

      addressable (>= 2.3.5, < 2.6)

      faraday (~> 0.8, < 1.0)

    scss_lint (0.52.0)

    scss_lint (0.53.0)

      rake (>= 0.9, < 13)

      sass (~> 3.4.20)

    secure_headers (3.6.1)
@@ -708,7 +678,7 @@ GEM 
    temple (0.8.0)

    term-ansicolor (1.4.0)

      tins (~> 1.0)

    terminal-table (1.7.3)

    terminal-table (1.7.1)

      unicode-display_width (~> 1.1.1)

    test_after_commit (1.1.0)

      activerecord (>= 3.2)
@@ -734,7 +704,7 @@ GEM 
      unf (~> 0.1.0)

    typhoeus (1.1.2)

      ethon (>= 0.9.0)

    tzinfo (1.2.2)

    tzinfo (1.2.3)

      thread_safe (~> 0.1)

    uglifier (3.1.2)

      execjs (>= 0.3.0, < 3)
@@ -805,8 +775,8 @@ DEPENDENCIES 
  devise (= 4.2.0)

  devise_lastseenable (= 0.0.6)

  diaspora-prosody-config (= 0.0.7)

  diaspora_federation-rails (= 0.1.8)

  diaspora_federation-test (= 0.1.8)

  diaspora_federation-rails (= 0.1.9)

  diaspora_federation-test (= 0.1.9)

  entypo-rails (= 3.0.0)

  eye (= 0.9.1)

  factory_girl_rails (= 4.8.0)
@@ -821,7 +791,7 @@ DEPENDENCIES 
  guard-cucumber (= 2.1.2)

  guard-rspec (= 4.7.3)

  guard-rubocop (= 1.2.0)

  haml_lint (= 0.21.0)

  haml_lint (= 0.24.0)

  hamlit (= 2.8.0)

  handlebars_assets (= 0.23.1)

  http_accept_language (= 2.1.0)
@@ -841,7 +811,7 @@ DEPENDENCIES 
  minitest

  mobile-fu (= 1.3.1)

  mysql2 (= 0.4.5)

  nokogiri (= 1.7.1)

  nokogiri (= 1.7.2)

  omniauth (= 1.4.2)

  omniauth-facebook (= 4.0.0)

  omniauth-tumblr (= 1.2)
@@ -851,11 +821,11 @@ DEPENDENCIES 
  openid_connect (= 0.12.0)

  pg (= 0.19.0)

  poltergeist (= 1.13.0)

  pronto (= 0.8.2)

  pronto-eslint (= 0.8.0)

  pronto-haml (= 0.8.0)

  pronto-rubocop (= 0.8.0)

  pronto-scss (= 0.8.0)

  pronto (= 0.9.3)

  pronto-eslint (= 0.9.1)

  pronto-haml (= 0.9.0)

  pronto-rubocop (= 0.9.0)

  pronto-scss (= 0.9.1)

  pry

  pry-byebug

  quiet_assets (= 1.1.0)
@@ -886,14 +856,13 @@ DEPENDENCIES 
  rails-assets-markdown-it-sup (= 1.0.0)!

  rails-assets-perfect-scrollbar (= 0.6.16)!

  rails-i18n (= 4.0.8)

  rails-timeago (= 2.11.0)

  rails_admin (= 0.8.1)

  rails-timeago (= 2.16.0)

  rb-fsevent (= 0.9.8)

  rb-inotify (= 0.9.8)

  redcarpet (= 3.4.0)

  responders (= 2.3.0)

  rspec-rails (= 3.5.2)

  rubocop (= 0.47.1)

  rubocop (= 0.48.1)

  ruby-oembed (= 0.10.1)

  rubyzip (= 1.2.1)

  sass-rails (= 5.0.6)

app/assets/javascripts/app/views/publisher/uploader_view.js

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ app.views.PublisherUploader = Backbone.View.extend({ 
      element: this.el,

      button: this.el,



      text: {

        fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")

      },

      request: {

        endpoint: Routes.photos(),

        params: {