Merge branch 'release/0.5.3.0'

Author: denschub

.rubocop.yml

@@ -1,5 +1,7 @@
 AllCops:
   RunRailsCops: true
+  Exclude:
+    - 'db/schema.rb'
 
 # Commonly used screens these days easily fit more than 80 characters.
 Metrics/LineLength:
@@ -13,6 +15,10 @@ Metrics/MethodLength:
 # The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
 Metrics/ClassLength:
   Max: 1500
+  
+# Raise AbcSize from 15 to 20
+Metrics/AbcSize:
+  Max: 20
 
 # No space makes the method definition shorter and differentiates
 # from a regular assignment.

CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior should be reported by sending an email to [team@diasporafoundation.org](mailto:team@diasporafoundation.org).
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

Changelog.md

@@ -1,3 +1,36 @@
+# 0.5.3.0
+
+## Refactor
+* Drop broken correlations from the admin pages [#6223](https://github.com/diaspora/diaspora/pull/6223)
+* Extract PostService from PostsController [#6208](https://github.com/diaspora/diaspora/pull/6208)
+* Drop outdated/unused mbp-respond.min.js and mbp-modernizr-custom.js [#6257](https://github.com/diaspora/diaspora/pull/6257)
+* Refactor ApplicationController#after\_sign\_out\_path\_for [#6258](https://github.com/diaspora/diaspora/pull/6258)
+* Extract StatusMessageService from StatusMessagesController [#6280](https://github.com/diaspora/diaspora/pull/6280)
+* Refactor HomeController#toggle\_mobile [#6260](https://github.com/diaspora/diaspora/pull/6260)
+* Extract CommentService from CommentsController [#6307](https://github.com/diaspora/diaspora/pull/6307)
+* Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
+* Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
+* Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
+* Automatically follow the new HQ-Account [#6369](https://github.com/diaspora/diaspora/pull/6369)
+
+## Bug fixes
+* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
+* Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
+* Fix mobile photos index page [#6243](https://github.com/diaspora/diaspora/pull/6243)
+* Fix conversations view with no contacts [#6266](https://github.com/diaspora/diaspora/pull/6266)
+* Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
+* Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286)
+* Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339)
+* Fix pagination design on notifications page [#6364](https://github.com/diaspora/diaspora/pull/6364)
+
+## Features
+
+* Implement NodeInfo [#6239](https://github.com/diaspora/diaspora/pull/6239)
+* Display original author on reshares of NSFW posts [#6270](https://github.com/diaspora/diaspora/pull/6270)
+* Use avatars in hovercards as links to the profile [#6297](https://github.com/diaspora/diaspora/pull/6297)
+* Remove avatars of ignored users from stream faces [#6320](https://github.com/diaspora/diaspora/pull/6320)
+* New /m route to force the mobile view [#6354](https://github.com/diaspora/diaspora/pull/6354)
+
 # 0.5.2.0
 
 ## Refactor

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "4.2.3"
+gem "rails", "4.2.4"
 
 # Legacy Rails features, remove me!
 # responders (class level)
@@ -12,17 +12,18 @@ gem "unicorn", "4.9.0", require: false
 
 # Federation
 
-gem "diaspora_federation-rails", "0.0.3"
+gem "diaspora_federation-rails", "0.0.6"
 
 # API and JSON
 
 gem "acts_as_api", "0.4.2"
 gem "json",        "1.8.3"
+gem "json-schema", "2.5.1"
 
 # Authentication
 
 gem "devise", "3.5.1"
-gem "devise_lastseenable", "0.0.4"
+gem "devise_lastseenable", "0.0.6"
 gem "devise-token_authenticatable", "~> 0.4.0"
 
 # Captcha
@@ -31,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
 # Background processing
 
-gem "sidekiq", "3.4.1"
+gem "sidekiq", "3.4.2"
 gem "sinatra", "1.4.6"
 
 # Scheduled processing
@@ -40,7 +41,7 @@ gem "sidetiq", "0.6.3"
 
 # Compression
 
-gem "uglifier", "2.7.1"
+gem "uglifier", "2.7.2"
 
 # Configuration
 
@@ -55,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
 gem "bootstrap-sass", "2.3.2.2"
 gem "compass-rails",  "2.0.4"
 gem "sass-rails",     "5.0.1"
-gem "autoprefixer-rails", "5.2.1"
+gem "autoprefixer-rails", "5.2.1.1"
 
 # Database
 
@@ -64,12 +65,12 @@ ENV["DB"] ||= "mysql"
 gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
 gem "pg",     "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
 
-gem "activerecord-import", "0.8.0"
+gem "activerecord-import", "0.10.0"
 
 # File uploading
 
 gem "carrierwave", "0.10.0"
-gem "fog",         "1.31.0"
+gem "fog",         "1.32.0"
 gem "mini_magick", "4.2.7"
 gem "remotipart",  "1.2.1"
 
@@ -82,7 +83,7 @@ gem "entypo-rails", "2.2.3"
 
 # JavaScript
 
-gem "backbone-on-rails", "1.1.2.1"
+gem "backbone-on-rails", "1.2.0.0"
 gem "handlebars_assets", "0.20.2"
 gem "jquery-rails",      "4.0.4"
 gem "jquery-ui-rails",   "5.0.5"
@@ -106,7 +107,7 @@ source "https://rails-assets.org" do
   gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
   gem "rails-assets-jquery-placeholder",            "2.1.2"
   gem "rails-assets-jquery-textchange",             "0.2.3"
-  gem "rails-assets-perfect-scrollbar",             "0.6.3"
+  gem "rails-assets-perfect-scrollbar",             "0.6.4"
   gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
 end
 
@@ -146,8 +147,8 @@ gem "omniauth-wordpress", "0.2.2"
 gem "active_model_serializers", "0.9.3"
 
 # XMPP chat dependencies
-gem "diaspora-vines",             "~> 0.1.27"
-gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
+gem "diaspora-vines",             "~> 0.2.0.develop"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.4.alpha", "< 0.1.4.develop", source: "https://rails-assets.org"
 
 # Tags
 
@@ -157,13 +158,13 @@ gem "acts-as-taggable-on", "3.5.0"
 
 gem "addressable",        "2.3.8", require: "addressable/uri"
 gem "faraday",            "0.9.1"
-gem "faraday_middleware", "0.9.1"
+gem "faraday_middleware", "0.10.0"
 gem "faraday-cookie_jar", "0.0.6"
 gem "typhoeus",           "0.7.2"
 
 # Views
 
-gem "gon",                     "5.2.3"
+gem "gon",                     "6.0.1"
 gem "haml",                    "4.0.6"
 gem "mobile-fu",               "1.3.1"
 gem "will_paginate",           "3.0.7"
@@ -194,7 +195,7 @@ gem "minitest"
 group :production do # we don"t install these on travis to speed up test runs
   # Administration
 
-  gem "rails_admin", "0.6.8"
+  gem "rails_admin", "0.7.0"
 
   # Analytics
 
@@ -223,15 +224,15 @@ group :development do
   # Automatic test runs
   gem "guard-cucumber", "1.5.4"
   gem "guard-jshintrb", "1.1.1"
-  gem "guard-rspec",    "4.5.2"
+  gem "guard-rspec",    "4.6.3"
   gem "guard-rubocop",  "1.2.0"
-  gem "guard",          "2.12.5", require: false
+  gem "guard",          "2.13.0", require: false
   gem "rb-fsevent",     "0.9.5", require: false
   gem "rb-inotify",     "0.9.5", require: false
 
   # Linters
   gem "jshintrb", "0.3.0"
-  gem "rubocop",  "0.32.0"
+  gem "rubocop",  "0.32.1"
 
   # Preloading environment
 
@@ -260,24 +261,19 @@ group :test do
 
   gem "capybara",           "2.4.4"
   gem "database_cleaner" ,  "1.4.1"
-  gem "selenium-webdriver", "2.45.0"
-
-  source "https://rails-assets.org" do
-    gem "rails-assets-jquery-simulate",     "1.0.1"
-    gem "rails-assets-jquery-simulate-ext", "1.3.0"
-  end
+  gem "selenium-webdriver", "2.47.1"
 
   # General helpers
 
   gem "factory_girl_rails", "4.5.0"
-  gem "timecop",            "0.7.4"
+  gem "timecop",            "0.8.0"
   gem "webmock",            "1.21.0", require: false
   gem "shoulda-matchers",   "2.8.0", require: false
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails",     "3.3.2"
+  gem "rspec-rails",     "3.3.3"
 
   # Cucumber (integration tests)
   gem "cucumber-rails",     "1.4.2", require: false