Fix include_root_in_json misuse

since it is no longer exposed for instances, our post_presenter failed
hard.

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[{Gemfile,Rakefile,Guardfile,Procfile}]
+trim_trailing_whitespace = true
+
+[*.{js,hbs,rb,rake,ru,erb,haml,scss,sh,md}]
+trim_trailing_whitespace = true
+
+[*.yml]
+trim_trailing_whitespace = false

.foreman

@@ -1,2 +1,2 @@
 port: 3000
-formation: web=1,sidekiq=0
+formation: xmpp=0,web=1,sidekiq=0

.gitignore

@@ -1,6 +1,11 @@
+# xmpp certificates, keys and user data
+config/vines/*.crt
+config/vines/*.key
+
 #trademark sillyness
 app/views/home/_show.*
-app/assets/images/custom/*
+app/views/terms/terms.*
+app/assets/images/custom/
 
 
 # Configuration files
@@ -9,9 +14,10 @@ config/heroku.yml
 config/initializers/secret_token.rb
 config/redis.conf
 config/deploy_config.yml
+config/schedule.rb
 .bundle
-vendor/bundle/*
-vendor/cache/*
+vendor/bundle/
+vendor/cache/
 config/database.yml
 .rvmrc_custom
 .rvmrc.local
@@ -21,14 +27,20 @@ config/email_offset
 config/mailing_list.csv
 
 # Generated files
-log/*
+log/
 public/stylesheets/*.css
 public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
-coverage/*
-xml_locales/*
+coverage/
+xml_locales/
+public/404.html
+public/422.html
+public/500.html
+
+# Sprites
 app/assets/images/branding-*.png
+app/assets/images/branding/logos-*.png
 app/assets/images/icons-*.png
 app/assets/images/social_media_logos-*.png
 
@@ -37,16 +49,16 @@ app/assets/images/social_media_logos-*.png
 doc/
 
 # Uploaded files and local files
-public/uploads/*
-public/assets/*
+public/uploads/
+public/assets/
 public/source.tar*
 public/.well-known
-tmp/**/*
-tmp/*
+tmp/**/
+tmp/
 *.sqlite3
 
 # Temporary files of every sort
-.sass-cache/*
+.sass-cache/
 .DS_Store
 .idea
 .redcar
@@ -57,7 +69,6 @@ tmp/*
 *.swp
 *~
 *#
-bin/*
 nbproject
 patches-*
 capybara-*.html
@@ -66,6 +77,8 @@ dump.rdb
 #Rubinius's JIT
 *.rbc
 
-# Ignore precompiled assets
-# Heroku or Capistrano can and should regenerate them on every deploy
-public/assets
+#IDE
+diaspora.iml
+
+# Dolphin's directory's preferences files
+*.directory

.hound.yml

@@ -0,0 +1,9 @@
+java_script:
+  enabled: true
+  config_file: config/.jshint.json
+  ignore_file: config/.jshint_ignore
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+scss:
+  enabled: false

.jshintignore

@@ -0,0 +1 @@
+config/.jshint_ignore

.jshintrc

@@ -0,0 +1 @@
+config/.jshint.json

.pairs

@@ -1,15 +0,0 @@
-pairs:
-  dg: Daniel Grippi; daniel
-  rs: Raphael Sofaer; raphael
-  iz: Ilya Zhitomirskiy; ilya
-  ms: Maxwell Salzberg; maxwell
-  dh: Dan Hansen; ohaibbq
-  sm: Sarah Mei; sarah
-  mjs: Michael Sofaer; michael
-  jd: Jeff Dickey; dickeytk
-  dc: Dennis Collinson
-  tf: Tim Frazer
-  kf: Kevin Fitzpatrick
-email:
-  prefix: pair
-  domain: joindiaspora.com

.powenv

@@ -1 +0,0 @@
-export NEW_HOTNESS=yessir

.powrc

@@ -1,4 +0,0 @@
-if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ]; then
-  source "$rvm_path/scripts/rvm"
-  source ".rvmrc"
-fi

.rspec

@@ -3,4 +3,3 @@
 --color
 --tag ~performance
 --order random
---drb

.rubocop.yml

@@ -0,0 +1,148 @@
+AllCops:
+  RunRailsCops: true
+  Exclude:
+    - 'db/schema.rb'
+
+# Commonly used screens these days easily fit more than 80 characters.
+Metrics/LineLength:
+  Max: 120
+
+# Too short methods lead to extraction of single-use methods, which can make
+# the code easier to read (by naming things), but can also clutter the class
+Metrics/MethodLength: 
+  Max: 20
+
+# 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.
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Single quotes being faster is hardly measurable and only affects parse time.
+# Enforcing double quotes reduces the times where you need to change them
+# when introducing an interpolation. Use single quotes only if their semantics
+# are needed.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# We do not need to support Ruby 1.9, so this is good to use.
+Style/SymbolArray:
+  Enabled: true
+
+# Most readable form.
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+# Mixing the styles looks just silly.
+Style/HashSyntax:
+ EnforcedStyle: ruby19_no_mixed_keys
+
+# has_key? and has_value? are far more readable than key? and value?
+Style/DeprecatedHashMethods:
+  Enabled: false
+
+# String#% is by far the least verbose and only object oriented variant.
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    # inject seems more common in the community.
+    reduce: "inject"
+
+
+# Either allow this style or don't. Marking it as safe with parenthesis
+# is silly. Let's try to live without them for now.
+Style/ParenthesesAroundCondition:
+  AllowSafeAssignment: false
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: false
+
+# A specialized exception class will take one or more arguments and construct the message from it.
+# So both variants make sense. 
+Style/RaiseArgs:
+  Enabled: false
+
+# Indenting the chained dots beneath each other is not supported by this cop,
+# see https://github.com/bbatsov/rubocop/issues/1633
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
+# The argument that fail should be used to abort the program is wrong too,
+# there's Kernel#abort for that.
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+# Suppressing exceptions can be perfectly fine, and be it to avoid to
+# explicitly type nil into the rescue since that's what you want to return,
+# or suppressing LoadError for optional dependencies
+Lint/HandleExceptions:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  # The space here provides no real gain in readability while consuming
+  # horizontal space that could be used for a better parameter name.
+  # Also {| differentiates better from a hash than { | does.
+  SpaceBeforeBlockParameters: false
+
+# No trailing space differentiates better from the block:
+# foo} means hash, foo } means block.
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
+# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
+Style/BlockDelimiters:
+  Enabled: false
+
+# Enforcing -> would be nice, but not at the cost of enforcing lambda { } for
+# multiline lambdas.
+Style/Lambda:
+  Enabled: false
+
+# do / end blocks should be used for side effects,
+# methods that run a block for side effects and have
+# a useful return value are rare, assign the return
+# value to a local variable for those cases.
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+
+# Enforcing the names of variables? To single letter ones? Just no.
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# Shadowing outer local variables with block parameters is often useful
+# to not reinvent a new name for the same thing, it highlights the relation
+# between the outer variable and the parameter. The cases where it's actually
+# confusing are rare, and usually bad for other reasons already, for example
+# because the method is too long.
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
+# Check with yard instead.
+Style/Documentation:
+  Enabled: false 
+
+# This is just silly. Calling the argument `other` in all cases makes no sense.
+Style/OpMethod:
+  Enabled: false 
+
+# There are valid cases, for example debugging Cucumber steps,
+# also they'll fail CI anyway
+Lint/Debugger:
+  Enabled: false
+
+
+# Reset some HoundCI changes back to Rubocop defaults
+Style/DotPosition:
+  EnforcedStyle: leading

.ruby-gemset

@@ -0,0 +1 @@
+diaspora

.ruby-version

@@ -0,0 +1 @@
+2.1

.rvmrc

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-rvm rvmrc warning ignore
-
-. ./script/env/ruby_env
-
-if [ -e '.rvmrc.local' ]; then
-  . ./.rvmrc.local;
-elif [ -e '.rvmrc_custom' ] ; then
-  . ./.rvmrc_custom;
-else
-  if rvm list strings | grep -q "$ruby_version" ; then
-    rvm --create use "$ruby_version@$gemset"
-  else
-    printf "\e[00;31mPLEASE INSTALL RUBY $ruby_version WITH \`rvm install $ruby_version\`\n"
-    printf "Don't forget to run \`cd .. && cd -\` afterwards!\e[00m\n"
-    return 1
-  fi
-fi
-
-. ./script/env/ensure_right_rubygems

.travis.yml

@@ -1,12 +1,8 @@
-branches:
-  only:
-    - 'master'
-    - 'develop'
-
 language: ruby
-rvm:
-  - 1.9.3
 
+rvm:
+  - 2.1
+  - 2.0
 
 env:
   - DB=postgres BUILD_TYPE=other
@@ -14,13 +10,26 @@ env:
   - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
+sudo: false
+cache:
+  bundler: true
+  directories:
+    - app/assets/images
+
+branches:
+  only:
+    - 'master'
+    - 'stable'
+    - 'develop'
+
+before_install: gem install bundler
+bundler_args: "--without development production heroku --jobs 3 --retry 3"
 
-bundler_args: "--without development production heroku"
-before_install: "./script/ci/before_install.sh"
 script: "./script/ci/build.sh"
 
-
 notifications:
   irc:
     channels:
       - "irc.freenode.org:6667#diaspora-dev"
+    template:
+      - "%{repository_slug}#%{commit} (%{branch} - %{commit_subject}): %{message} %{build_url}"

AUTHORS

@@ -1,11 +1,7 @@
-Diaspora is written by:
-  Daniel Grippi
-  Ilya Zhitomirskiy
-  Maxwell Salzberg
-  Raphael Sofaer
+diaspora* was initially developed by:
+-  Ilya Zhitomirskiy
+-  Raphael Sofaer
+-  Daniel Grippi
+-  Maxwell Salzberg
 
-With help from many libraries and frameworks including:
-  JQuery
-  Ruby on Rails
-  Blueprint-CSS
-  and others
+It lives on as an open source project with many contributors, a self updating list is at: https://github.com/diaspora/diaspora/graphs/contributors

CODE_OF_CONDUCT.md

@@ -0,0 +1,50 @@
+# 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, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+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 may be
+reported by contacting a project maintainer at [team@diasporafoundation.org](mailto:team@diasporafoundation.org). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

COPYRIGHT

@@ -21,3 +21,8 @@ exception to your version of the file(s), but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement from your
 version.  If you delete this exception statement from all source files in the
 program, then also delete it here.
+
+Social Media Icons
+------------------
+Some icons are used from https://github.com/paulrobertlloyd/socialmediaicons
+Licensed under a Creative Commons Attribution-Share Alike 3.0 license

Changelog.md

@@ -1,3 +1,828 @@
+# 0.5.6.3
+
+Fix evil regression caused by Active Model no longer exposing
+`include_root_in_json` in instances.
+
+# 0.5.6.2
+
+* Fix [CVE-2016-0751](https://groups.google.com/forum/#!topic/rubyonrails-security/9oLY_FCzvoc) - Possible Object Leak and Denial of Service attack in Action Pack
+* Fix [CVE-2015-7581](https://groups.google.com/forum/#!topic/rubyonrails-security/dthJ5wL69JE) - Object leak vulnerability for wildcard controller routes in Action Pack
+* Fix [CVE-2015-7576](https://groups.google.com/forum/#!topic/rubyonrails-security/ANv0HDHEC3k) - Timing attack vulnerability in basic authentication in Action Controller
+* Fix [CVE-2016-0752](https://groups.google.com/forum/#!topic/rubyonrails-security/335P1DcLG00) - Possible Information Leak Vulnerability in Action View
+* Fix [CVE-2016-0753](https://groups.google.com/forum/#!topic/rubyonrails-security/6jQVC1geukQ) - Possible Input Validation Circumvention in Active Model
+* Fix [CVE-2015-7577](https://groups.google.com/forum/#!topic/rubyonrails-security/cawsWcQ6c8g) - Nested attributes rejection proc bypass in Active Record
+* Fix [CVE-2015-7579](https://groups.google.com/forum/#!topic/rubyonrails-security/OU9ugTZcbjc) - XSS vulnerability in rails-html-sanitizer
+* Fix [CVE-2015-7578](https://groups.google.com/forum/#!topic/rubyonrails-security/uh--W4TDwmI) - Possible XSS vulnerability in rails-html-sanitizer
+
+# 0.5.6.1
+
+* Fix Nokogiri CVE-2015-7499
+* Fix unsafe "Remember me" cookies in Devise
+
+# 0.5.6.0
+
+## Refactor
+* Add more integration tests with the help of the new diaspora-federation gem [#6539](https://github.com/diaspora/diaspora/pull/6539)
+
+## Bug fixes
+* Fix mention autocomplete when pasting the username [#6510](https://github.com/diaspora/diaspora/pull/6510)
+* Use and update updated\_at for notifications [#6573](https://github.com/diaspora/diaspora/pull/6573)
+* Ensure the author signature is checked when receiving a relayable [#6539](https://github.com/diaspora/diaspora/pull/6539)
+* Do not try to display hovercards when logged out [#6587](https://github.com/diaspora/diaspora/pull/6587)
+
+## Features
+
+* Display hovercards without aspect dropdown when logged out [#6603](https://github.com/diaspora/diaspora/pull/6603)
+* Add media.ccc.de as a trusted oEmbed endpoint
+
+# 0.5.5.1
+
+* Fix XSS on profile pages
+* Bump nokogiri to fix several libxml2 CVEs, see http://www.ubuntu.com/usn/usn-2834-1/
+
+# 0.5.5.0
+
+## Bug fixes
+* Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
+* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
+* Fix notifications for interactions by non-contacts [#6498](https://github.com/diaspora/diaspora/pull/6498)
+* Fix issue where the publisher was broken on profile pages [#6503](https://github.com/diaspora/diaspora/pull/6503)
+* Prevent participations being created for invalid interactions [#6552](https://github.com/diaspora/diaspora/pull/6552)
+* Improve federation for reshare related interactions [#6481](https://github.com/diaspora/diaspora/pull/6481)
+
+# 0.5.4.0
+
+## Refactor
+*  Improve infinite scroll triggering [#6451](https://github.com/diaspora/diaspora/pull/6451)
+
+## Bug fixes
+* Skip first getting started step if it looks done already [#6456](https://github.com/diaspora/diaspora/pull/6456)
+* Normalize new followed tags and insert them alphabetically [#6454](https://github.com/diaspora/diaspora/pull/6454)
+* Add avatar fallback for notification dropdown [#6463](https://github.com/diaspora/diaspora/pull/6463)
+* Improve handling of j/k hotkeys [#6462](https://github.com/diaspora/diaspora/pull/6462)
+* Fix JS error caused by hovercards [6480](https://github.com/diaspora/diaspora/pull/6480)
+
+## Features
+* Show spinner on initial stream load [#6384](https://github.com/diaspora/diaspora/pull/6384)
+* Add new moderator role. Moderators can view and act on reported posts [#6351](https://github.com/diaspora/diaspora/pull/6351)
+* Only post to the primary tumblr blog [#6386](https://github.com/diaspora/diaspora/pull/6386)
+* Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
+* Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411)
+* Add stream of all public posts [#6465](https://github.com/diaspora/diaspora/pull/6465)
+* Reload stream when clicking on already active one [#6466](https://github.com/diaspora/diaspora/pull/6466)
+* Sign in user before evaluating post visibility [#6490](https://github.com/diaspora/diaspora/pull/6490)
+
+# 0.5.3.1
+
+Fix a leak of potentially private profile data to unauthorized users who were sharing with the person
+and on a pod that received that data.
+
+# 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
+* Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
+* Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)
+* Add link to pod statistics in right navigation [#6117](https://github.com/diaspora/diaspora/pull/6117)
+* Refactor person related URL generation [#6168](https://github.com/diaspora/diaspora/pull/6168)
+* Move webfinger and HCard generation out of the core and embed the `diaspora_federation-rails` gem [#6151](https://github.com/diaspora/diaspora/pull/6151/)
+* Refactor rspec tests to to use `let` instead of before blocks [#6199](https://github.com/diaspora/diaspora/pull/6199)
+* Refactor tests for EXIF stripping [#6183](https://github.com/diaspora/diaspora/pull/6183)
+
+## Bug fixes
+* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
+* Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111)
+* Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118)
+* Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146)
+* Capitalize Wiki link [#6193](https://github.com/diaspora/diaspora/pull/6193)
+
+## Features
+* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
+* Send new users a welcome message from the podmin [#6128](https://github.com/diaspora/diaspora/pull/6128)
+* Cleanup temporary upload files daily [#6147](https://github.com/diaspora/diaspora/pull/6147)
+* Add guid to posts and comments in the user export [#6185](https://github.com/diaspora/diaspora/pull/6185)
+
+# 0.5.1.2
+
+diaspora\* versions prior 0.5.1.2 leaked potentially private profile data (namely the bio, birthday, gender and location fields) to
+unauthorized users. While the frontend properly hid them, the backend missed a check to not include them in responses.
+Thanks to @cmrd-senya for finding and reporting the issue.
+
+# 0.5.1.1
+
+Update rails to 4.2.2, rack to 1.6.2 and jquery-rails to 4.0.4. This fixes
+
+* [CVE-2015-3226](https://groups.google.com/d/msg/rubyonrails-security/7VlB_pck3hU/3QZrGIaQW6cJ)
+* [CVE-2015-3227](https://groups.google.com/d/msg/rubyonrails-security/bahr2JLnxvk/x4EocXnHPp8J)
+* [CVE-2015-1840](https://groups.google.com/d/msg/rubyonrails-security/XIZPbobuwaY/fqnzzpuOlA4J)
+* [CVE-2015-3225](https://groups.google.com/d/msg/rubyonrails-security/gcUbICUmKMc/qiCotVZwXrMJ)
+
+# 0.5.1.0
+
+## Refactor
+* Use Bootstrap modal for new aspect pane [#5850](https://github.com/diaspora/diaspora/pull/5850)
+* Use asset helper instead of .css.erb [#5886](https://github.com/diaspora/diaspora/pull/5886)
+* Dropped db/seeds.rb [#5896](https://github.com/diaspora/diaspora/pull/5896)
+* Drop broken install scripts [#5907](https://github.com/diaspora/diaspora/pull/5907)
+* Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915)
+* Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943)
+* Remove some old temporary workarounds [#5964](https://github.com/diaspora/diaspora/pull/5964)
+* Remove unused `hasPhotos` and `hasText` functions [#5969](https://github.com/diaspora/diaspora/pull/5969)
+* Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966)
+* Improved handling of reshares with deleted roots [#5968](https://github.com/diaspora/diaspora/pull/5968)
+* Remove two unused methods [#5970](https://github.com/diaspora/diaspora/pull/5970)
+* Refactored the Logger to add basic logrotating and more useful timestamps [#5975](https://github.com/diaspora/diaspora/pull/5975)
+* Gracefully handle mailer failures if a like is already deleted again [#5983](https://github.com/diaspora/diaspora/pull/5983)
+* Ensure posts have an author [#5986](https://github.com/diaspora/diaspora/pull/5986)
+* Improve the logging messages of Sidekiq messages [#5988](https://github.com/diaspora/diaspora/pull/5988)
+* Improve the logging of Eyes output [#5989](https://github.com/diaspora/diaspora/pull/5989)
+* Gracefully handle XML parse errors within federation [#5991](https://github.com/diaspora/diaspora/pull/5991)
+* Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
+* Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004)
+* Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005)
+* Improve styling of horizontal ruler in posts [#6016](https://github.com/diaspora/diaspora/pull/6016)
+* Increase post titles length to 50 and use configured pod name as title in the atom feed [#6020](https://github.com/diaspora/diaspora/pull/6020)
+* Remove deprecated Facebook permissions [#6019](https://github.com/diaspora/diaspora/pull/6019)
+* Make used post title lengths more consistent [#6022](https://github.com/diaspora/diaspora/pull/6022)
+* Improved logging source [#6041](https://github.com/diaspora/diaspora/pull/6041)
+* Gracefully handle duplicate entry while receiving share-visibility in parallel [#6068](https://github.com/diaspora/diaspora/pull/6068)
+* Update twitter gem to get rid of deprecation warnings [#6083](https://github.com/diaspora/diaspora/pull/6083)
+* Refactor photos federation to get rid of some hacks [#6082](https://github.com/diaspora/diaspora/pull/6082)
+
+## Bug fixes
+* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
+* Fix only sharing flag for contacts that are receiving [#5848](https://github.com/diaspora/diaspora/pull/5848)
+* Return 406 when requesting a JSON representation of people/:guid/contacts [#5849](https://github.com/diaspora/diaspora/pull/5849)
+* Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854)
+* Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877)
+* Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883)
+* Improve output of script/server [#5885](https://github.com/diaspora/diaspora/pull/5885)
+* Fix CSS for bold links [#5887](https://github.com/diaspora/diaspora/pull/5887)
+* Correctly handle IE8 in the chrome frame middleware [#5878](https://github.com/diaspora/diaspora/pull/5878)
+* Fix code reloading for PostPresenter [#5888](https://github.com/diaspora/diaspora/pull/5888)
+* Fix closing account from mobile view [#5913](https://github.com/diaspora/diaspora/pull/5913)
+* Allow using common custom template for desktop & mobile landing page [#5915](https://github.com/diaspora/diaspora/pull/5915)
+* Use correct branding in Atom feed [#5929](https://github.com/diaspora/diaspora/pull/5929)
+* Update the configurate gem to avoid issues by missed missing settings keys [#5934](https://github.com/diaspora/diaspora/pull/5934)
+* ContactPresenter#full_hash_with_person did not contain relationship information [#5936](https://github.com/diaspora/diaspora/pull/5936)
+* Fix inactive user removal not respecting configuration for daily limits [#5953](https://github.com/diaspora/diaspora/pull/5953)
+* Fix missing localization of inactive user removal warning emails [#5950](https://github.com/diaspora/diaspora/issues/5950)
+* Fix fetching for public post while Webfingering [#5958](https://github.com/diaspora/diaspora/pull/5958)
+* Handle empty searchable in HCard gracefully [#5962](https://github.com/diaspora/diaspora/pull/5962)
+* Fix a freeze in new post parsing [#5965](https://github.com/diaspora/diaspora/pull/5965)
+* Add case insensitive unconfirmed email addresses as authentication key [#5967](https://github.com/diaspora/diaspora/pull/5967)
+* Fix liking on single post views when accessed via GUID [#5978](https://github.com/diaspora/diaspora/pull/5978)
+* Only return the current_users participation for post interactions [#6007](https://github.com/diaspora/diaspora/pull/6007)
+* Fix tag rendering in emails [#6009](https://github.com/diaspora/diaspora/pull/6009)
+* Fix the logo in emails [#6013](https://github.com/diaspora/diaspora/pull/6013)
+* Disable autocorrect for username on mobile sign in [#6028](https://github.com/diaspora/diaspora/pull/6028)
+* Fix broken default avatars in the database [#6014](https://github.com/diaspora/diaspora/pull/6014)
+* Only strip text direction codepoints around hashtags [#6067](https://github.com/diaspora/diaspora/issues/6067)
+* Fix selected week on admin weekly stats page [#6079](https://github.com/diaspora/diaspora/pull/6079)
+* Fix that some unread conversations may be hidden [#6060](https://github.com/diaspora/diaspora/pull/6060)
+* Fix photo links in the mobile interface [#6082](https://github.com/diaspora/diaspora/pull/6082)
+
+## Features
+* Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)
+* More and better environment checks in script/server [#5891](https://github.com/diaspora/diaspora/pull/5891)
+* Enable aspect sorting again [#5559](https://github.com/diaspora/diaspora/pull/5559)
+* Submit messages in conversations with Ctrl+Enter [#5910](https://github.com/diaspora/diaspora/pull/5910)
+* Support syntax highlighting for fenced code blocks [#5908](https://github.com/diaspora/diaspora/pull/5908)
+* Added link to diasporafoundation.org to invitation email [#5893](https://github.com/diaspora/diaspora/pull/5893)
+* Gracefully handle missing `og:url`s [#5926](https://github.com/diaspora/diaspora/pull/5926)
+* Remove private post content from "also commented" mails [#5931](https://github.com/diaspora/diaspora/pull/5931)
+* Add a button to follow/unfollow tags to the mobile interface [#5941](https://github.com/diaspora/diaspora/pull/5941)
+* Add a "Manage followed tags" page to mass unfollow tags in the mobile interface [#5945](https://github.com/diaspora/diaspora/pull/5945)
+* Add popover/tooltip about email visibility to registration/settings page [#5956](https://github.com/diaspora/diaspora/pull/5956)
+* Fetch person posts on sharing request [#5960](https://github.com/diaspora/diaspora/pull/5960)
+* Introduce 'authorized' configuration option for services [#5985](https://github.com/diaspora/diaspora/pull/5985)
+* Added configuration options for log rotating [#5994](https://github.com/diaspora/diaspora/pull/5994)
+
+# 0.5.0.1
+
+Use the correct setting for captcha length instead of defaulting to 1 always.
+
+# 0.5.0.0
+
+## Major Sidekiq update
+This release includes a major upgrade of the background processing system Sidekiq. To upgrade cleanly:
+
+1. Stop diaspora*
+2. Run `RAILS_ENV=production bundle exec sidekiq` and wait 5-10 minutes, then stop it again (hit `CTRL+C`)
+3. Do a normal upgrade of diaspora*
+4. Start diaspora*
+
+## Rails 4 - Manual action required
+Please edit `config/initializers/secret_token.rb`, replacing `secret_token` with
+`secret_key_base`.
+
+```ruby
+# Old
+Rails.application.config.secret_token = '***********...'
+
+# New
+Diaspora::Application.config.secret_key_base = '*************...'
+```
+
+You also need to take care to set `RAILS_ENV` and to clear the cache while precompiling assets: `RAILS_ENV=production bundle exec rake tmp:cache:clear assets:precompile`
+
+## Supported Ruby versions
+This release drops official support for the Ruby 1.9 series. This means we will no longer test against this Ruby version or take care to choose libraries
+that work with it. However that doesn't mean we won't accept patches that improve running diaspora* on it.
+
+At the same time we adopt support for the Ruby 2.1 series and recommend running on the latest Ruby version of that branch. We continue to support the Ruby 2.0
+series and run our comprehensive test suite against it.
+
+## Change in defaults.yml
+The default for including jQuery from a CDN has changed. If you want to continue to include it from a CDN, please explicitly set the `jquery_cdn` setting to `true` in diaspora.yml.
+
+## Change in database.yml
+For MySQL databases, replace `charset: utf8` with `encoding: utf8mb4` and  change `collation` from `utf8_bin` to `utf8mb4_bin` in the file `config/database.yml`.
+This is enables full UTF8 support (4bytes characters), including standard emoji characters.
+See `database.yml.example` for reference.
+Please make sure to stop Diaspora prior running this migration!
+
+## Experimental chat feature
+This release adds experimental integration with XMPP for real-time chat. Please see  [our wiki](https://wiki.diasporafoundation.org/Vines) for further informations.
+
+## Change in statistics.json schema
+The way services are shown in the `statistics.json` route is changing. The keys relating to showing whether services are enabled or not are moving to their own container as `"services": {....}`, instead of having them all in the root level of the JSON.
+
+The keys will still be available in the root level within the 0.5 release. The old keys will be removed in the 0.6 release.
+
+## New maintenance feature to automatically expire inactive accounts
+Removing of old inactive users can now be done automatically by background processing. The amount of inactivity is set by `after_days`. A warning email will be sent to the user and after an additional `warn_days`, the account will be automatically closed.
+
+This maintenance is not enabled by default. Podmins can enable it by for example copying over the new settings under `settings.maintenance` to their `diaspora.yml` file and setting it enabled. The default setting is to expire accounts that have been inactive for 2 years (no login).
+
+## Camo integration to proxy external assets
+It is now possible to enable an automatic proxying of external assets, for example images embedded via Markdown or OpenGraph thumbnails loaded from insecure third party servers through a [Camo proxy](https://github.com/atmos/camo).
+
+This is disabled by default since it requires the installation of additional packages and might cause some traffic. Check the [wiki page](https://wiki.diasporafoundation.org/Installation/Camo) for more information and detailed installation instructions.
+
+## Paypal unhosted button and currency
+Podmins can now set the currency for donations, and use an unhosted button if they can't use
+a hosted one. Note: you need to **copy the new settings from diaspora.yml.example to your
+diaspora.yml file**. The existing settings from 0.4.x and before will not work any more.
+
+## Custom splash page changes
+diaspora* no longer adds a `div.container` to wrap custom splash pages. This adds the ability for podmins to write home pages using Bootstrap's fluid design. Podmins who added a custom splash page in `app/views/home/_show.{html,mobile}.haml` need to wrap the contents into a `div.container` to keep the old design. You will find updated examples [in our wiki](https://wiki.diasporafoundation.org/Custom_splash_page).
+
+## Refactor
+* Redesign contacts page [#5153](https://github.com/diaspora/diaspora/pull/5153)
+* Improve profile page design on mobile [#5084](https://github.com/diaspora/diaspora/pull/5084)
+* Port test suite to RSpec 3 [#5170](https://github.com/diaspora/diaspora/pull/5170)
+* Port tag stream to Bootstrap [#5138](https://github.com/diaspora/diaspora/pull/5138)
+* Consolidate migrations, if you need a migration prior 2013, checkout the latest release in the 0.4.x series first [#5173](https://github.com/diaspora/diaspora/pull/5173)
+* Add tests for mobile sign up [#5185](https://github.com/diaspora/diaspora/pull/5185)
+* Display new conversation form on conversations/index [#5178](https://github.com/diaspora/diaspora/pull/5178)
+* Port profile page to Backbone [#5180](https://github.com/diaspora/diaspora/pull/5180)
+* Pull punycode.js from rails-assets.org [#5263](https://github.com/diaspora/diaspora/pull/5263)
+* Redesign profile page and port to Bootstrap [#4657](https://github.com/diaspora/diaspora/pull/4657)
+* Unify stream selection links in the left sidebar [#5271](https://github.com/diaspora/diaspora/pull/5271)
+* Refactor schema of statistics.json regarding services [#5296](https://github.com/diaspora/diaspora/pull/5296)
+* Pull jquery.idle-timer.js from rails-assets.org [#5310](https://github.com/diaspora/diaspora/pull/5310)
+* Pull jquery.placeholder.js from rails-assets.org [#5299](https://github.com/diaspora/diaspora/pull/5299)
+* Pull jquery.textchange.js from rails-assets.org [#5297](https://github.com/diaspora/diaspora/pull/5297)
+* Pull jquery.hotkeys.js from rails-assets.org [#5368](https://github.com/diaspora/diaspora/pull/5368)
+* Reduce amount of useless background job retries and pull public posts when missing [#5209](https://github.com/diaspora/diaspora/pull/5209)
+* Updated Weekly User Stats admin page to show data for the most recent week including reversing the order of the weeks in the drop down to show the most recent. [#5331](https://github.com/diaspora/diaspora/pull/5331)
+* Convert some cukes to RSpec tests [#5289](https://github.com/diaspora/diaspora/pull/5289)
+* Hidden overflow for long names on tag pages [#5279](https://github.com/diaspora/diaspora/pull/5279)
+* Always reshare absolute root of a post [#5276](https://github.com/diaspora/diaspora/pull/5276)
+* Convert remaining SASS stylesheets to SCSS [#5342](https://github.com/diaspora/diaspora/pull/5342)
+* Update rack-protection [#5403](https://github.com/diaspora/diaspora/pull/5403)
+* Cleanup diaspora.yml [#5426](https://github.com/diaspora/diaspora/pull/5426)
+* Replace `opengraph_parser` with `open_graph_reader` [#5462](https://github.com/diaspora/diaspora/pull/5462)
+* Make sure conversations without any visibilities left are deleted [#5478](https://github.com/diaspora/diaspora/pull/5478)
+* Change tooltip for delete button in conversations view [#5477](https://github.com/diaspora/diaspora/pull/5477)
+* Replace a modifier-rescue with a specific rescue [#5491](https://github.com/diaspora/diaspora/pull/5491)
+* Port contacts page to backbone [#5473](https://github.com/diaspora/diaspora/pull/5473)
+* Replace CSS vendor prefixes automatically [#5532](https://github.com/diaspora/diaspora/pull/5532)
+* Use sentence case consistently throughout UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
+* Hide sign up button when registrations are disabled [#5612](https://github.com/diaspora/diaspora/pull/5612)
+* Standardize capitalization throughout the UI [#5588](https://github.com/diaspora/diaspora/pull/5588)
+* Display photos on the profile page as thumbnails [#5521](https://github.com/diaspora/diaspora/pull/5521)
+* Unify not connected pages (sign in, sign up, forgot password) [#5391](https://github.com/diaspora/diaspora/pull/5391)
+* Port remaining stream pages to Bootstrap [#5715](https://github.com/diaspora/diaspora/pull/5715)
+* Port notification dropdown to Backbone [#5707](https://github.com/diaspora/diaspora/pull/5707) [#5761](https://github.com/diaspora/diaspora/pull/5761)
+* Add rounded corners for avatars [#5733](https://github.com/diaspora/diaspora/pull/5733)
+* Move registration form to a partial [#5764](https://github.com/diaspora/diaspora/pull/5764)
+* Add tests for liking and unliking posts [#5741](https://github.com/diaspora/diaspora/pull/5741)
+* Rewrite slide effect in conversations as css transition for better performance [#5776](https://github.com/diaspora/diaspora/pull/5776)
+* Various cleanups and improvements in the frontend code [#5781](https://github.com/diaspora/diaspora/pull/5781) [#5769](https://github.com/diaspora/diaspora/pull/5769) [#5763](https://github.com/diaspora/diaspora/pull/5763) [#5762](https://github.com/diaspora/diaspora/pull/5762) [#5758](https://github.com/diaspora/diaspora/pull/5758) [#5755](https://github.com/diaspora/diaspora/pull/5755) [#5747](https://github.com/diaspora/diaspora/pull/5747) [#5734](https://github.com/diaspora/diaspora/pull/5734) [#5786](https://github.com/diaspora/diaspora/pull/5786) [#5768](https://github.com/diaspora/diaspora/pull/5798)
+* Add specs and validations to the role model [#5792](https://github.com/diaspora/diaspora/pull/5792)
+* Replace 'Make something' text by diaspora ball logo on registration page [#5743](https://github.com/diaspora/diaspora/pull/5743)
+
+## Bug fixes
+* orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
+* Move submit button to the right in conversations view [#4960](https://github.com/diaspora/diaspora/pull/4960)
+* Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
+* Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
+* Use correct locale for invitation subject [#5232](https://github.com/diaspora/diaspora/pull/5232)
+* Initial support for IDN emails
+* Fix services settings reported by statistics.json [#5256](https://github.com/diaspora/diaspora/pull/5256)
+* Only collapse empty comment box [#5328](https://github.com/diaspora/diaspora/pull/5328)
+* Fix pagination for people/guid/contacts [#5304](https://github.com/diaspora/diaspora/pull/5304)
+* Fix poll creation on Bootstrap pages [#5334](https://github.com/diaspora/diaspora/pull/5334)
+* Show error message on invalid reset password attempt [#5325](https://github.com/diaspora/diaspora/pull/5325)
+* Fix translations on mobile password reset pages [#5318](https://github.com/diaspora/diaspora/pull/5318)
+* Handle unset user agent when signing out [#5316](https://github.com/diaspora/diaspora/pull/5316)
+* More robust URL parsing for oEmbed and OpenGraph [#5347](https://github.com/diaspora/diaspora/pull/5347)
+* Fix Publisher doesn't expand while uploading images [#3098](https://github.com/diaspora/diaspora/issues/3098)
+* Drop unneeded and too open crossdomain.xml
+* Fix hidden aspect dropdown on getting started page [#5407](https://github.com/diaspora/diaspora/pulls/5407)
+* Fix a few issues on Bootstrap pages [#5401](https://github.com/diaspora/diaspora/pull/5401)
+* Improve handling of the `more` link on mobile stream pages [#5400](https://github.com/diaspora/diaspora/pull/5400)
+* Fix prefilling publisher after getting started [#5442](https://github.com/diaspora/diaspora/pull/5442)
+* Fix overflow in profile sidebar [#5450](https://github.com/diaspora/diaspora/pull/5450)
+* Fix code overflow in SPV and improve styling for code tags [#5422](https://github.com/diaspora/diaspora/pull/5422)
+* Correctly validate if local recipients actually want to receive a conversation [#5449](https://github.com/diaspora/diaspora/pull/5449)
+* Improve consistency of poll answer ordering [#5471](https://github.com/diaspora/diaspora/pull/5471)
+* Fix broken aspect selectbox on asynchronous search results [#5488](https://github.com/diaspora/diaspora/pull/5488)
+* Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ [#5509](https://github.com/diaspora/diaspora/pull/5509)
+* Repair downloading the profile image from Facebook [#5493](https://github.com/diaspora/diaspora/pull/5493)
+* Fix localization of post and comment timestamps on mobile [#5482](https://github.com/diaspora/diaspora/issues/5482)
+* Fix mobile JS loading to quieten errors. Fixes also service buttons on mobile bookmarklet.
+* Don't error out when adding a too long location to the profile [#5614](https://github.com/diaspora/diaspora/pull/5614)
+* Correctly decrease unread count for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
+* Fix automatic scroll for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
+* Fix missing translation on privacy settings page [#5671](https://github.com/diaspora/diaspora/pull/5671)
+* Fix code overflow for the mobile website [#5675](https://github.com/diaspora/diaspora/pull/5675)
+* Strip Unicode format characters prior post processing [#5680](https://github.com/diaspora/diaspora/pull/5680)
+* Disable email notifications for closed user accounts [#5640](https://github.com/diaspora/diaspora/pull/5640)
+* Total user statistic no longer includes closed accounts [#5041](https://github.com/diaspora/diaspora/pull/5041)
+* Don't add a space when rendering a mention [#5711](https://github.com/diaspora/diaspora/pull/5711)
+* Fix flickering hovercards [#5714](https://github.com/diaspora/diaspora/pull/5714) [#5876](https://github.com/diaspora/diaspora/pull/5876)
+* Improved stripping markdown in post titles [#5730](https://github.com/diaspora/diaspora/pull/5730)
+* Remove border from reply form for conversations [#5744](https://github.com/diaspora/diaspora/pull/5744)
+* Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731)
+* Correct photo count on profile page [#5751](https://github.com/diaspora/diaspora/pull/5751)
+* Fix mobile sign up from an invitation [#5754](https://github.com/diaspora/diaspora/pull/5754)
+* Set max-width for tag following button on tag page [#5752](https://github.com/diaspora/diaspora/pull/5752)
+* Display error messages for failed password change [#5580](https://github.com/diaspora/diaspora/pull/5580)
+* Display correct error message for too long tags [#5783](https://github.com/diaspora/diaspora/pull/5783)
+* Fix displaying reshares in the stream on mobile [#5790](https://github.com/diaspora/diaspora/pull/5790)
+* Remove bottom margin from lists that are the last element of a post. [#5721](https://github.com/diaspora/diaspora/pull/5721)
+* Fix pagination design on conversations page [#5791](https://github.com/diaspora/diaspora/pull/5791)
+* Prevent inserting posts into the wrong stream [#5838](https://github.com/diaspora/diaspora/pull/5838)
+* Update help section [#5857](https://github.com/diaspora/diaspora/pull/5857) [#5859](https://github.com/diaspora/diaspora/pull/5859)
+* Fix asset precompilation check in script/server [#5863](https://github.com/diaspora/diaspora/pull/5863)
+* Convert MySQL databases to utf8mb4 [#5530](https://github.com/diaspora/diaspora/pull/5530) [#5624](https://github.com/diaspora/diaspora/pull/5624) [#5865](https://github.com/diaspora/diaspora/pull/5865)
+* Don't upcase labels on mobile sign up/sign in [#5872](https://github.com/diaspora/diaspora/pull/5872)
+
+## Features
+* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
+* Better character limit message [#5151](https://github.com/diaspora/diaspora/pull/5151)
+* Remember whether a AccountDeletion was performed [#5156](https://github.com/diaspora/diaspora/pull/5156)
+* Increased the number of notifications shown in drop down bar to 15 [#5129](https://github.com/diaspora/diaspora/pull/5129)
+* Increase possible captcha length [#5169](https://github.com/diaspora/diaspora/pull/5169)
+* Display visibility icon in publisher aspects dropdown [#4982](https://github.com/diaspora/diaspora/pull/4982)
+* Add a link to the reported comment in the admin panel [#5337](https://github.com/diaspora/diaspora/pull/5337)
+* Strip search query from leading and trailing whitespace [#5317](https://github.com/diaspora/diaspora/pull/5317)
+* Add the "network" key to statistics.json and set it to "Diaspora" [#5308](https://github.com/diaspora/diaspora/pull/5308)
+* Infinite scrolling in the notifications dropdown [#5237](https://github.com/diaspora/diaspora/pull/5237)
+* Maintenance feature to automatically expire inactive accounts [#5288](https://github.com/diaspora/diaspora/pull/5288)
+* Add LibreJS markers to JavaScript [5320](https://github.com/diaspora/diaspora/pull/5320)
+* Ask for confirmation when leaving a submittable publisher [#5309](https://github.com/diaspora/diaspora/pull/5309)
+* Allow page-specific styling via individual CSS classes [#5282](https://github.com/diaspora/diaspora/pull/5282)
+* Change diaspora logo in the header on hover [#5355](https://github.com/diaspora/diaspora/pull/5355)
+* Display diaspora handle in search results [#5419](https://github.com/diaspora/diaspora/pull/5419)
+* Show a message on the ignored users page when there are none [#5434](https://github.com/diaspora/diaspora/pull/5434)
+* Truncate too long OpenGraph descriptions [#5387](https://github.com/diaspora/diaspora/pull/5387)
+* Make the source code URL configurable [#5410](https://github.com/diaspora/diaspora/pull/5410)
+* Prefill publisher on the tag pages [#5442](https://github.com/diaspora/diaspora/pull/5442)
+* Don't include the content of non-public posts into notification mails [#5494](https://github.com/diaspora/diaspora/pull/5494)
+* Allow to set unhosted button and currency for paypal donation [#5452](https://github.com/diaspora/diaspora/pull/5452)
+* Add followed tags in the mobile menu [#5468](https://github.com/diaspora/diaspora/pull/5468)
+* Replace Pagedown with markdown-it [#5526](https://github.com/diaspora/diaspora/pull/5526)
+* Do not truncate notification emails anymore [#4342](https://github.com/diaspora/diaspora/issues/4342)
+* Allows users to export their data in gzipped JSON format from their user settings page [#5499](https://github.com/diaspora/diaspora/pull/5499)
+* Strip EXIF data from newly uploaded images [#5510](https://github.com/diaspora/diaspora/pull/5510)
+* Hide user setting if the community spotlight is not enabled on the pod [#5562](https://github.com/diaspora/diaspora/pull/5562)
+* Add HTML view for pod statistics [#5464](https://github.com/diaspora/diaspora/pull/5464)
+* Added/Moved hide, block user, report and delete button in SPV [#5547](https://github.com/diaspora/diaspora/pull/5547)
+* Added keyboard shortcuts r(reshare), m(expand Post), o(open first link in post) [#5602](https://github.com/diaspora/diaspora/pull/5602)
+* Added dropdown to add/remove people from/to aspects in mobile view [#5594](https://github.com/diaspora/diaspora/pull/5594)
+* Dynamically compute minimum and maximum valid year for birthday field [#5639](https://github.com/diaspora/diaspora/pull/5639)
+* Show hovercard on mentions [#5652](https://github.com/diaspora/diaspora/pull/5652)
+* Make help sections linkable [#5667](https://github.com/diaspora/diaspora/pull/5667)
+* Add invitation link to contacts page [#5655](https://github.com/diaspora/diaspora/pull/5655)
+* Add year to notifications page [#5676](https://github.com/diaspora/diaspora/pull/5676)
+* Give admins the ability to lock & unlock accounts [#5643](https://github.com/diaspora/diaspora/pull/5643)
+* Add reshares to the stream view immediately [#5699](https://github.com/diaspora/diaspora/pull/5699)
+* Update and improve help section [#5665](https://github.com/diaspora/diaspora/pull/5665), [#5706](https://github.com/diaspora/diaspora/pull/5706)
+* Expose participation controls in the stream view [#5511](https://github.com/diaspora/diaspora/pull/5511)
+* Reimplement photo export [#5685](https://github.com/diaspora/diaspora/pull/5685)
+* Add participation controls in the single post view [#5722](https://github.com/diaspora/diaspora/pull/5722)
+* Display polls on reshares [#5782](https://github.com/diaspora/diaspora/pull/5782)
+* Remove footer from stream pages [#5816](https://github.com/diaspora/diaspora/pull/5816)
+
+# 0.4.1.3
+
+* Update Redcarped, fixes [OSVDB-120415](http://osvdb.org/show/osvdb/120415).
+
+# 0.4.1.2
+
+* Update Rails, fixes [CVE-2014-7818](https://groups.google.com/forum/#!topic/rubyonrails-security/dCp7duBiQgo).
+
+# 0.4.1.1
+
+* Fix XSS issue in poll questions [#5274](https://github.com/diaspora/diaspora/issues/5274)
+
+# 0.4.1.0
+
+## New 'Terms of Service' feature and template
+
+This release brings a new ToS feature that allows pods to easily display to users the terms of service they are operating on. This feature is not enabled by default. If you want to enable it, please add under `settings` in `config/diaspora.yml` the following and restart diaspora. If in doubt see `config/diaspora.yml.example`:
+
+    terms:
+      enable: true
+
+When enabled, the footer and sidebar will have a link to terms page, and sign up will have a disclaimer indicating that creating an account means the user accepts the terms of use.
+
+While the project itself doesn't restrict what kind of terms pods run on, we realize not all podmins want to spend time writing them from scratch. Thus there is a basic ToS template included that will be used unless a custom one available.
+
+To modify (or completely rewrite) the terms template, create a file called `app/views/terms/terms.haml` or `app/views/terms/terms.erb` and it will automatically replace the default template, which you can find at `app/views/terms/default.haml`.
+
+There are also two configuration settings to customize the terms (when using the default template). These are optional.
+
+* `settings.terms.jurisdiction` - indicate here in which country or state any legal disputes are handled.
+* `settings.terms.minimum_age` - indicate here if you want to show a minimum required age for creating an account.
+
+## Rake task to email users
+
+There is a new Rake task `podmin:admin_mail` available to allow podmins to easily send news and notices to users. The rake task triggers emails via the normal diaspora mailer mechanism (so they are embedded in the standard template) and takes the following parameters:
+
+1) Users definition
+
+* `all` - all users in the database (except deleted)
+* `active_yearly` - users logged in within the last year
+* `active_monthly` - users logged in within the last month
+* `active_halfyear` - users logged in within the last 6 months
+
+2) Path to message file
+
+* Give here a path to a HTML or plain text file that contains the message.
+
+3) Subject
+
+* A subject for the email
+
+Example shell command (depending on your environment);
+
+`RAILS_ENV=production bundle exec rake podmin:admin_mail['active_monthly','./message.html','Important message from pod']`
+
+Read more about [specifying arguments to Rake tasks](http://stackoverflow.com/a/825832/1489738).
+
+## Refactor
+* Port help pages to Bootstrap [#5050](https://github.com/diaspora/diaspora/pull/5050)
+* Refactor Notification#notify [#4945](https://github.com/diaspora/diaspora/pull/4945)
+* Port getting started to Bootstrap [#5057](https://github.com/diaspora/diaspora/pull/5057)
+* Port people search page to Bootstrap [#5077](https://github.com/diaspora/diaspora/pull/5077)
+* Clarify explanations and defaults in diaspora.yml.example [#5088](https://github.com/diaspora/diaspora/pull/5088)
+* Consistent header spacing on Bootstrap pages [#5108](https://github.com/diaspora/diaspora/pull/5108)
+* Port settings pages (account, profile, privacy, services) to Bootstrap [#5039](https://github.com/diaspora/diaspora/pull/5039)
+* Port contacts and community spotlight pages to Bootstrap [#5118](https://github.com/diaspora/diaspora/pull/5118)
+* Redesign login page [#5112](https://github.com/diaspora/diaspora/pull/5112)
+* Change mark read link on notifications page [#5141](https://github.com/diaspora/diaspora/pull/5141)
+
+## Bug fixes
+* Fix hiding of poll publisher on close [#5029](https://github.com/diaspora/diaspora/issues/5029)
+* Fix padding in user menu [#5047](https://github.com/diaspora/diaspora/pull/5047)
+* Fix self-XSS when renaming an aspect [#5048](https://github.com/diaspora/diaspora/pull/5048)
+* Fix live updating when renaming an aspect [#5049](https://github.com/diaspora/diaspora/pull/5049)
+* Use double quotes when embedding translations into Javascript [#5055](https://github.com/diaspora/diaspora/issues/5055)
+* Fix regression in mobile sign-in ([commit](https://github.com/diaspora/diaspora/commit/4a2836b108f8a9eb6f46ca58cfcb7b23f40bb076))
+* Set mention notification as read when viewing post [#5006](https://github.com/diaspora/diaspora/pull/5006)
+* Set sharing notification as read when viewing profile [#5009](https://github.com/diaspora/diaspora/pull/5009)
+* Ensure a consistent border on text input elements [#5069](https://github.com/diaspora/diaspora/pull/5069)
+* Escape person name in contacts json returned by Conversations#new
+* Make sure all parts of the hovercard are always in front [#5188](https://github.com/diaspora/diaspora/pull/5188)
+
+## Features
+* Port admin pages to bootstrap, polish user search results, allow accounts to be closed from the backend [#5046](https://github.com/diaspora/diaspora/pull/5046)
+* Reference Salmon endpoint in Webfinger XRD to aid discovery by alternative implementations [#5062](https://github.com/diaspora/diaspora/pull/5062)
+* Change minimal birth year for the birthday field to 1910 [#5083](https://github.com/diaspora/diaspora/pull/5083)
+* Add scrolling thumbnail switcher in the lightbox [#5102](https://github.com/diaspora/diaspora/pull/5102)
+* Add help section about keyboard shortcuts [#5100](https://github.com/diaspora/diaspora/pull/5100)
+* Automatically add poll answers as needed [#5109](https://github.com/diaspora/diaspora/pull/5109)
+* Add Terms of Service as an option for podmins, includes base template [#5104](https://github.com/diaspora/diaspora/pull/5104)
+* Add rake task to send a mail to all users [#5111](https://github.com/diaspora/diaspora/pull/5111)
+* Expose which services are configured in /statistics.json [#5121](https://github.com/diaspora/diaspora/pull/5121)
+* In filtered notification views, replace "Mark all as read" with "Mark shown as read" [#5122](https://github.com/diaspora/diaspora/pull/5122)
+* When ignoring a user remove his posts from the stream instantly [#5127](https://github.com/diaspora/diaspora/pull/5127)
+* Allow to delete photos from the pictures stream [#5131](https://github.com/diaspora/diaspora/pull/5131)
+
+# 0.4.0.1
+
+## Bug fixes
+
+* Fix performance regression on stream loading with MySQL/MariaDB database backends [#5014](https://github.com/diaspora/diaspora/issues/5014)
+* Fix issue with post reporting [#5017](https://github.com/diaspora/diaspora/issues/5017)
+
+# 0.4.0.0
+
+## Ensure account deletions are run
+
+A regression caused accounts deletions to not properly perform in some cases, see [#4792](https://github.com/diaspora/diaspora/issues/4792).
+To ensure these are reexecuted properly, please run `RAILS_ENV=production bundle exec rake accounts:run_deletions`
+after you've upgraded.
+
+## Change in guid generation
+
+This version will break federation to pods running on versions prior 0.1.1.0.
+
+Read more in [#4249](https://github.com/diaspora/diaspora/pull/4249) and [#4883](https://github.com/diaspora/diaspora/pull/4883)
+
+## Refactor
+* Drop number of followers from tags page [#4717](https://github.com/diaspora/diaspora/pull/4717)
+* Remove some unused beta code [#4738](https://github.com/diaspora/diaspora/pull/4738)
+* Style improvements for SPV, use original author's avatar for reshares [#4754](https://github.com/diaspora/diaspora/pull/4754)
+* Update image branding to the new decided standard [#4702](https://github.com/diaspora/diaspora/pull/4702)
+* Consistent naming of conversations and messages [#4756](https://github.com/diaspora/diaspora/pull/4756)
+* Improve stream generation time [#4769](https://github.com/diaspora/diaspora/pull/4769)
+* Port help pages to backbone [#4768](https://github.com/diaspora/diaspora/pull/4768)
+* Add participants to conversations menu [#4656](https://github.com/diaspora/diaspora/pull/4656)
+* Update forgot_password and reset_password pages [#4707](https://github.com/diaspora/diaspora/pull/4707)
+* Change jQuery CDN to jquery.com from googleapis.com [#4765](https://github.com/diaspora/diaspora/pull/4765)
+* Update to jQuery 10
+* Port publisher and bookmarklet to Bootstrap [#4678](https://github.com/diaspora/diaspora/pull/4678)
+* Improve search page, add better indications [#4794](https://github.com/diaspora/diaspora/pull/4794)
+* Port notifications and hovercards to Bootstrap [#4814](https://github.com/diaspora/diaspora/pull/4814)
+* Replace .rvmrc by .ruby-version and .ruby-gemset [#4854](https://github.com/diaspora/diaspora/pull/4855)
+* Reorder and reword items on user settings page [#4912](https://github.com/diaspora/diaspora/pull/4912)
+* SPV: Improve padding and interaction counts [#4426](https://github.com/diaspora/diaspora/pull/4426)
+* Remove auto 'mark as read' for notifications [#4810](https://github.com/diaspora/diaspora/pull/4810)
+* Improve set read/unread in notifications dropdown [#4869](https://github.com/diaspora/diaspora/pull/4869)
+* Refactor publisher: trigger events for certain actions, introduce 'disabled' state [#4932](https://github.com/diaspora/diaspora/pull/4932)
+
+## Bug fixes
+* Fix user account deletion [#4953](https://github.com/diaspora/diaspora/pull/4953) and [#4963](https://github.com/diaspora/diaspora/pull/4963)
+* Fix email body language when invite a friend [#4832](https://github.com/diaspora/diaspora/issues/4832)
+* Improve time agos by updating the plugin [#4281](https://github.com/diaspora/diaspora/pull/4281)
+* Do not add a space after adding a mention [#4767](https://github.com/diaspora/diaspora/issues/4767)
+* Fix active user statistics by saving a last seen timestamp for users [#4802](https://github.com/diaspora/diaspora/pull/4802)
+* Render HTML in atom user feed [#4835](https://github.com/diaspora/diaspora/pull/4835)
+* Fix plaintext mode of Mentionable [#4831](https://github.com/diaspora/diaspora/pull/4831)
+* Fixed Atom Feed Error if reshared Post is deleted [#4841](https://github.com/diaspora/diaspora/pull/4841)
+* Show hovercards in the notification drop-down for users on the same pod [#4843](https://github.com/diaspora/diaspora/pull/4843)
+* The photo stream no longer repeats after the last photo [#4787](https://github.com/diaspora/diaspora/pull/4787)
+* Fix avatar alignment for hovercards in the notifications dropdown [#4853](https://github.com/diaspora/diaspora/pull/4853)
+* Do not parse hashtags inside Markdown links [#4856](https://github.com/diaspora/diaspora/pull/4856)
+* Restore comment textarea content after revealing more comments [#4858](https://github.com/diaspora/diaspora/pull/4858)
+* OpenGraph: don't make description into links [#4708](https://github.com/diaspora/diaspora/pull/4708)
+* Don't cut off long tags in stream posts [#4878](https://github.com/diaspora/diaspora/pull/4878)
+* Do not replace earlier appearances of the name while mentioning somebody [#4882](https://github.com/diaspora/diaspora/pull/4882)
+* Catch exceptions when trying to decode an invalid URI [#4889](https://github.com/diaspora/diaspora/pull/4889)
+* Redirect to the stream when switching the mobile publisher to desktop [#4917](https://github.com/diaspora/diaspora/pull/4917)
+* Parsing mention witch contain in username special characters [#4919](https://github.com/diaspora/diaspora/pull/4919)
+* Do not show your own hovercard [#4758](https://github.com/diaspora/diaspora/pull/4758)
+* Hit Nominatim via https [#4968](https://github.com/diaspora/diaspora/pull/4968)
+
+## Features
+* You can report a single post or comment by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517) [#4781](https://github.com/diaspora/diaspora/pull/4781)
+* Add permalinks for comments [#4577](https://github.com/diaspora/diaspora/pull/4577)
+* New menu for the mobile version [#4673](https://github.com/diaspora/diaspora/pull/4673)
+* Added comment count to statistic to enable calculations of posts/comments ratios [#4799](https://github.com/diaspora/diaspora/pull/4799)
+* Add filters to notifications controller [#4814](https://github.com/diaspora/diaspora/pull/4814)
+* Activate hovercards in SPV and conversations [#4870](https://github.com/diaspora/diaspora/pull/4870)
+* Added possibility to conduct polls [#4861](https://github.com/diaspora/diaspora/pull/4861) [#4894](https://github.com/diaspora/diaspora/pull/4894) [#4897](https://github.com/diaspora/diaspora/pull/4897) [#4899](https://github.com/diaspora/diaspora/pull/4899)
+
+# 0.3.0.3
+
+* Bump Rails to 3.2.17, fixes CVE-2014-0081, CVE-2014-0082. For more information see http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
+
+# 0.3.0.2
+
+## Bug fixes
+* Use youtube HTTPS scheme for oEmbed [#4743](https://github.com/diaspora/diaspora/pull/4743)
+* Fix infinite scroll on aspect streams [#4747](https://github.com/diaspora/diaspora/pull/4747)
+* Fix hovercards [#4782](https://github.com/diaspora/diaspora/pull/4782)
+* Bump kaminari to fix admin panel [#4714](https://github.com/diaspora/diaspora/issues/4714)
+
+# 0.3.0.1
+
+## Bug fixes
+* Fix regression caused by using after_commit with nested '#save' which lead to an infinite recursion [#4715](https://github.com/diaspora/diaspora/issues/4715)
+* Save textarea value before rendering comments when clicked 'show more...' [#4858](https://github.com/diaspora/diaspora/pull/4858)
+
+# 0.3.0.0
+
+## Pod statistics
+A new feature [has been added](https://github.com/diaspora/diaspora/pull/4602) to allow pods to report extra statistics. Automatically after this code change, the route /statistics.json contains some basic data that was also available before via page headers (pod name, version, status of signups). But also, optionally podmins can enable user and post counts in the diaspora.yml configuration file. The counts are by default switched off, so if you want to report the total user, active user and local post counts, please edit your diaspora.yml configuration with the example values in diaspora.yml.example and uncomment the required lines as indicated.
+
+## Ruby 2.0
+
+We now recommend using Ruby 2.0 with Diaspora. If you're using RVM make sure to run:
+```bash
+rvm get stable
+rvm install 2.0.0
+cd ~/diaspora
+git pull
+cd - && cd ..
+```
+
+For more details see https://wiki.diasporafoundation.org/Updating
+
+## Refactor
+* Remove old SPV code [#4612](https://github.com/diaspora/diaspora/pull/4612)
+* Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363)
+* Build a color palette to uniform color usage [#4437](https://github.com/diaspora/diaspora/pull/4437) [#4469](https://github.com/diaspora/diaspora/pull/4469) [#4479](https://github.com/diaspora/diaspora/pull/4479)
+* Rename bitcoin_wallet_id setting to bitcoin_address [#4485](https://github.com/diaspora/diaspora/pull/4485)
+* Batch insert posts into stream collection for a small speedup [#4341](https://github.com/diaspora/diaspora/pull/4351)
+* Ported fileuploader to Backbone and refactored publisher views [#4480](https://github.com/diaspora/diaspora/pull/4480)
+* Refactor 404.html, fix [#4078](https://github.com/diaspora/diaspora/issues/4078)
+* Remove the (now useless) last post link from the user profile. [#4540](https://github.com/diaspora/diaspora/pull/4540)
+* Refactor ConversationsController, move query building to User model. [#4547](https://github.com/diaspora/diaspora/pull/4547)
+* Refactor the Twitter service model [#4387](https://github.com/diaspora/diaspora/pull/4387)
+* Refactor ConversationsController#create, move more stuff to User model [#4551](https://github.com/diaspora/diaspora/pull/4551)
+* Refactor MessagesController#create, move stuff to User model [#4556](https://github.com/diaspora/diaspora/pull/4556)
+* Reorder the left bar side menu to put the stream first [#4569](https://github.com/diaspora/diaspora/pull/4569)
+* Improve notifications and conversations views design on mobile [#4593](https://github.com/diaspora/diaspora/pull/4593)
+* Slight redesign of mobile publisher [#4604](https://github.com/diaspora/diaspora/pull/4604)
+* Port conversations to Bootstrap [#4622](https://github.com/diaspora/diaspora/pull/4622)
+* Remove participants popover and improve conversations menu [#4644](https://github.com/diaspora/diaspora/pull/4644)
+* Refactor right side bar [#4793](https://github.com/diaspora/diaspora/pull/4793)
+
+## Bug fixes
+* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)
+* Make invite code input width consistent across browsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
+* Fix style of contacts in profile sidebar [#4451](https://github.com/diaspora/diaspora/pull/4451)
+* Fix profile mobile when logged out [#4464](https://github.com/diaspora/diaspora/pull/4464)
+* Fix preview with more than one mention [#4450](https://github.com/diaspora/diaspora/issues/4450)
+* Fix size of images in the SPV [#4471](https://github.com/diaspora/diaspora/pull/4471)
+* Adjust 404 message description to not leak logged out users if a post exists or not [#4477](https://github.com/diaspora/diaspora/pull/4477)
+* Make I18n system more robust against missing keys in pluralization data
+* Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487)
+* Disable submit button in sign up form after submission to avoid email already exists error [#4506](https://github.com/diaspora/diaspora/issues/4506)
+* Do not pull the 404 pages assets from Amazon S3 [#4501](https://github.com/diaspora/diaspora/pull/4501)
+* Fix counter background does not cover more than 2 digits on profile [#4499](https://github.com/diaspora/diaspora/issues/4499)
+* Fix commenting upon submission fail [#4005] (https://github.com/diaspora/diaspora/issues/4005)
+* Fix date color and alignment in the notifications dropdown [#4502](https://github.com/diaspora/diaspora/issues/4502)
+* Add a white background to images shown in the lightbox [#4475](https://github.com/diaspora/diaspora/issues/4475)
+* Refactor getting_started page, test if facebook is available, fix [#4520](https://github.com/diaspora/diaspora/issues/4520)
+* Avoid publishing empty posts [#4542](https://github.com/diaspora/diaspora/pull/4542)
+* Force comments sort order in mobile spv [#4578](https://github.com/diaspora/diaspora/pull/4578)
+* Fix getting started page for mobile [#4536](https://github.com/diaspora/diaspora/pull/4536)
+* Refactor mobile header, fix [#4579](https://github.com/diaspora/diaspora/issues/4579)
+* Fix avatar display on mobile profile [#4591](https://github.com/diaspora/diaspora/pull/4591)
+* Add lightbox to unauthenticated header, fix [#4432](https://github.com/diaspora/diaspora/issues/4432)
+* Fix "more picture" indication (+n) on mobile by adding a link on the indication [#4592](https://github.com/diaspora/diaspora/pull/4592)
+* Display errors when photo upload fails [#4509](https://github.com/diaspora/diaspora/issues/4509)
+* Fix posting to Twitter by correctly catching exception [#4627](https://github.com/diaspora/diaspora/issues/4627)
+* Change "Show n more comments"-link, fix [#3119](https://github.com/diaspora/diaspora/issues/3119)
+* Specify Firefox version for Travis-CI [#4623](https://github.com/diaspora/diaspora/pull/4623)
+* Remove location when publisher is cleared by user
+* On signup form errors, don't empty previous values by user, fix [#4663](https://github.com/diaspora/diaspora/issues/4663)
+* Remove background from badges in header [#4692](https://github.com/diaspora/diaspora/issues/4692)
+
+## Features
+* Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
+* One click to select the invite URL [#4447](https://github.com/diaspora/diaspora/pull/4447)
+* Disable "mark all as read" link if all notifications are read [#4463](https://github.com/diaspora/diaspora/pull/4463)
+* Collapse aspect list and tag followings list when switching to other views [#4462](https://github.com/diaspora/diaspora/pull/4462)
+* Highlight current stream in left sidebar [#4445](https://github.com/diaspora/diaspora/pull/4445)
+* Added ignore user icon on user profile [#4417](https://github.com/diaspora/diaspora/pull/4417)
+* Improve the management of the contacts visibility settings in an aspect [#4567](https://github.com/diaspora/diaspora/pull/4567)
+* Add actions on aspects on the contact page [#4570](https://github.com/diaspora/diaspora/pull/4570)
+* Added a statistics route with general pod information, and if enabled in pod settings, total user, half year/monthly active users and local post counts [#4602](https://github.com/diaspora/diaspora/pull/4602)
+* Add indication about markdown formatting in the publisher [#4589](https://github.com/diaspora/diaspora/pull/4589)
+* Add captcha to signup form [#4659](https://github.com/diaspora/diaspora/pull/4659)
+* Update Underscore.js 1.3.1 to 1.5.2, update Backbone.js 0.9.2 to 1.1.0 [#4662](https://github.com/diaspora/diaspora/pull/4662)
+* Display more than 8 pictures on a post [#4796](https://github.com/diaspora/diaspora/pull/4796)
+
+## Gem updates
+Added:
+* atomic (1.1.14)
+* bcrypt-ruby (3.1.2)
+* backbone-on-rails (1.1.0.0)
+* devise thread_safe (0.1)
+* eco (1.0.0)
+* eco-source (1.1.0.rc.1)
+* ejs (1.1.1)
+* galetahub-simple_captcha (0.1.5)
+* thread_safe (0.1.3)
+* zip-zip (0.2)
+
+Removed:
+* bcrypt-ruby
+* rb-kqueue
+* slim
+* temple
+
+Updated:
+* acts_as_api 0.4.1 -> 0.4.2
+* capybara 2.1.0 -> 2.2.1
+* celluloid (0.13.0 -> 0.15.2
+* chunky_png 1.2.8 -> 1.2.9
+* client_side_validations 3.2.5 -> 3.2.6
+* coderay 1.0.9 -> 1.1.0
+* connection_pool 1.0.0 -> 1.2.0
+* crack 0.4.0 -> 0.4.1
+* cucumber 1.3.5 -> 1.3.10
+* cucumber-rails 1.3.1 -> 1.4.0
+* database_cleaner 1.1.0 -> 1.2.0
+* devise 3.0.2 -> 3.2.2
+* diff-lcs 1.2.4 -> 1.2.5
+* ethon 0.5.12 -> 0.6.2
+* excon 0.25.3 -> 0.31.0
+* factory_girl 4.2.0 -> 4.3.0
+* factory_girl_rails 4.2.0 -> 4.3.0
+* faraday 0.8.8 -> 0.8.9
+* ffi 1.9.0 -> 1.9.3
+* fog 1.14.0 -> 1.19.0
+* foreigner 1.4.2 -> 1.6.1
+* fuubar 1.1.1 -> 1.3.2
+* gherkin 2.12.0 -> 2.12.2
+* guard 1.8.2 -> 2.2.5
+* guard-cucumber 1.4.0 -> 1.4.1
+* guard-rspec 3.0.2 -> 4.2.4
+* haml 4.0.3 -> 4.0.5
+* i18n-inflector-rails 1.0.6 -> 1.0.7
+* json 1.8.0 -> 1.8.1
+* jwt 0.1.8 -> 0.1.10
+* kaminari 0.14.1 -> 0.15.0
+* kgio 2.8.0 -> 2.8.1
+* listen 1.2.2 -> 2.4.0
+* mini_magick 3.6.0 -> 3.7.0
+* mini_profile 0.5.1 -> 0.5.2
+* mobile-fu 1.2.1 -> 1.2.2
+* multi_json 1.7.9 -> 1.8.4
+* multi_test 0.0.2 -> 0.0.3
+* mysql2 0.3.13 -> 0.3.14
+* net-ssh 2.6.8 -> 2.7.0
+* nokogiri 1.6.0 -> 1.6.1
+* omniauth-facebook 1.4.1 -> 1.6.0
+* omniauth-twitter 1.0.0 -> 1.0.1
+* orm_adapter 0.4.0 -> 0.5.0
+* pry 0.9.12.2 -> 0.9.12.4
+* rack-google-analytics 0.11.0 -> 0.14.0
+* rack-rewrite 1.3.3 -> 1.5.0
+* rails_autolink 1.1.0 -> 1.1.5
+* raindrops 0.11.0 -> 0.12.0
+* rake 10.1.0 -> 10.1.1
+* rb-fsevent 0.9.3 -> 0.9.4
+* rb-inotify 0.9.0 -> 0.9.3
+* redis 3.0.4 -> 3.0.6
+* redis-namespace 1.3.0 -> 1.4.1
+* rspec 2.13.0 -> 2.14.1
+* rspec-core 2.13.1 -> 2.14.7
+* rspec-expectations 2.13.0 -> 2.14.4
+* rspec-mocks 2.13.1 -> 2.14.4
+* rspec-rails 2.13.2 -> 2.14.1
+* ruby-oembed 0.8.8 -> 0.8.9
+* ruby-progressbar 1.1.1 -> 1.4.0
+* selenium-webdriver 2.34.0 -> 2.39.0
+* sidekiq 2.11.1 -> 2.17.2
+* slop 3.4.6 -> 3.4.7
+* spork 1.0.0rc3 -> 1.0.0rc4
+* strong_parameters 0.2.1 -> 0.2.2
+* test_after_commit 0.2.0 -> 0.2.2
+* timers 1.0.0 -> 1.1.0
+* timecop 0.6.1 -> 0.7.1
+* typhoeus 0.6.3 -> 0.6.7
+* unicorn 4.6.3 -> 4.8.0
+* webmock 1.13.0 -> 1.16.1
+* will_paginate 3.0.4 -> 3.0.5
+
+# 0.2.0.1
+
+* Bump rails to version 3.2.16, fixes several security issues, see http://weblog.rubyonrails.org/2013/12/3/Rails_3_2_16_and_4_0_2_have_been_released/
+* Bump recommended Ruby version to 1.9.3-p484, see https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/
+
 # 0.2.0.0
 
 **Attention:** This release includes a potentially long running migration! However it should be safe to run this while keeping your application servers on.
@@ -64,7 +889,7 @@
 * Add possibility to ask for Bitcoin donations [#4375](https://github.com/diaspora/diaspora/pull/4375)
 * Remove posts, comments and private conversations from the mobile site. [#4408](https://github.com/diaspora/diaspora/pull/4408) [#4409](https://github.com/diaspora/diaspora/pull/4409)
 * Added a link to user photos and thumbnails are shown in the left side bar [#4347](https://github.com/diaspora/diaspora/issues/4347)
-* Rework the single post view
+* Rework the single post view [#4410](https://github.com/diaspora/diaspora/pull/4410)
 * Add aspect modification on contacts page, close [#4397](https://github.com/diaspora/diaspora/issues/4397)
 * Add help page [#4405](https://github.com/diaspora/diaspora/issues/4405)
 
@@ -117,7 +942,6 @@
 * webmock 1.11.0 -> 1.13.0
 * xpath 0.1.4 -> 2.0.0
 
-
 # 0.1.1.0
 
 ## Refactor
@@ -296,7 +1120,7 @@ everything is set up.
 * Cleanup of script/server
 * Attempt to stabilize federation of attached photos (fix [#3033](https://github.com/diaspora/diaspora/issues/3033)  [#3940](https://github.com/diaspora/diaspora/pull/3940) )
 * Refactor develop install script [#4111](https://github.com/diaspora/diaspora/pull/4111)
-* Remove special hacks for supporting Ruby 1.8 [#4113] (https://github.com/diaspora/diaspora/pull/4139)
+* Remove special hacks for supporting Ruby 1.8 [#4113](https://github.com/diaspora/diaspora/pull/4139)
 * Moved custom oEmbed providers to config/oembed_providers.yml [#4131](https://github.com/diaspora/diaspora/pull/4131)
 * Add specs for Post#find_by_guid_or_id_with_user
 
@@ -650,7 +1474,7 @@ The new configuration system allows all possible settings to be overriden by env
 
 ### Environment variable changes:
 
-#### deprectated
+#### deprecated
 
 * REDISTOGO_URL in favour of REDIS_URL or ENVIRONMENT_REDIS
 
@@ -709,4 +1533,3 @@ The single-post view will also be revamped/reverted, but that didn't make it int
 
 
 ## Cleanup in maintenance scripts and automated build environment
-

Gemfile

@@ -1,212 +1,291 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', '3.2.13'
+gem "rails", "4.2.5.1"
+
+# Legacy Rails features, remove me!
+# responders (class level)
+gem "responders", "2.1.1"
 
 # Appserver
 
-gem 'unicorn', '4.6.3', :require => false
+gem "unicorn", "5.0.1", require: false
+
+# Federation
+
+gem "diaspora_federation-rails", "0.0.11"
 
 # API and JSON
 
-gem 'acts_as_api', '0.4.1'
-gem 'json',        '1.8.0'
+gem "acts_as_api", "0.4.2"
+gem "json",        "1.8.3"
+gem "json-schema", "2.5.2"
 
 # Authentication
 
-gem 'devise', '3.0.2'
+gem "devise", "3.5.4"
+gem "devise_lastseenable", "0.0.6"
+gem "devise-token_authenticatable", "~> 0.4.0"
+
+# Captcha
+
+gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
 # Background processing
 
-gem 'sidekiq', '2.11.1'
-gem 'sinatra', '1.3.3'
-gem 'slim', '1.3.9'
+gem "sidekiq", "3.4.2"
+gem "sinatra", "1.4.6"
+
+# Scheduled processing
+
+gem "sidetiq", "0.6.3"
+
+# Compression
+
+gem "uglifier", "2.7.2"
 
 # Configuration
 
-gem 'configurate', '0.0.8'
+gem "configurate", "0.3.1"
 
 # Cross-origin resource sharing
 
-gem 'rack-cors', '0.2.8', :require => 'rack/cors'
+gem "rack-cors", "0.4.0", require: "rack/cors"
+
+# CSS
+
+gem "bootstrap-sass", "2.3.2.2"
+gem "compass-rails",  "2.0.5"
+gem "sass-rails",     "5.0.4"
+gem "autoprefixer-rails", "6.2.2"
 
 # Database
 
-ENV['DB'] ||= 'mysql'
+ENV["DB"] ||= "mysql"
 
-gem 'mysql2', '0.3.13' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
-gem 'pg',     '0.16.0' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
+gem "mysql2", "0.3.20" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg",     "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
 
-gem 'activerecord-import', '0.3.1'
-gem 'foreigner',           '1.4.2'
+gem "activerecord-import", "0.10.0"
 
 # File uploading
 
-gem 'carrierwave', '0.9.0'
-gem 'fog',         '1.14.0'
-gem 'mini_magick', '3.6.0'
-gem 'remotipart',  '1.2.1'
+gem "carrierwave", "0.10.0"
+gem "fog",         "1.37.0"
+gem "mini_magick", "4.3.6"
+gem "remotipart",  "1.2.1"
+
+# GUID generation
+gem "uuid", "2.3.8"
+
+# Icons
+
+gem "entypo-rails", "2.2.3"
+
+# JavaScript
+
+gem "backbone-on-rails", "1.2.0.0"
+gem "handlebars_assets", "0.22.0"
+gem "jquery-rails",      "4.0.5"
+gem "jquery-ui-rails",   "5.0.5"
+gem "js_image_paths",    "0.0.2"
+gem "js-routes",         "1.2.0"
+
+source "https://rails-assets.org" do
+  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
+
+  gem "rails-assets-markdown-it",                         "5.0.2"
+  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
+  gem "rails-assets-markdown-it-diaspora-mention",        "0.4.0"
+  gem "rails-assets-markdown-it-sanitizer",               "0.4.1"
+  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
+  gem "rails-assets-markdown-it-sub",                     "1.0.0"
+  gem "rails-assets-markdown-it-sup",                     "1.0.0"
+  gem "rails-assets-highlightjs",                         "9.0.0"
+
+  # jQuery plugins
+
+  gem "rails-assets-jeresig--jquery.hotkeys",       "0.2.0"
+  gem "rails-assets-jquery-placeholder",            "2.3.1"
+  gem "rails-assets-jquery-textchange",             "0.2.3"
+  gem "rails-assets-perfect-scrollbar",             "0.6.8"
+  gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
+end
+
+gem "facebox-rails", "0.2.0"
 
 # Localization
 
-gem 'http_accept_language', '1.0.2'
-gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n',           '0.7.4'
+gem "http_accept_language", "2.0.5"
+gem "i18n-inflector-rails", "1.0.7"
+gem "rails-i18n",           "4.0.8"
 
 # Mail
 
-gem 'markerb',             '1.0.1'
-gem 'messagebus_ruby_api', '1.0.3'
+gem "markerb",             "1.1.0"
+gem "messagebus_ruby_api", "1.0.3"
 
 # Parsing
 
-gem 'nokogiri',         '1.6.0'
-gem 'rails_autolink',   '1.1.0'
-gem 'redcarpet',        '3.0.0'
-gem 'roxml',            '3.1.6'
-gem 'ruby-oembed',      '0.8.8'
-gem 'opengraph_parser', '0.2.3'
-
-
-# Please remove when migrating to Rails 4
-gem 'strong_parameters'
-
+gem "nokogiri",          "1.6.7.2"
+gem "redcarpet",         "3.3.4"
+gem "twitter-text",      "1.13.0"
+gem "roxml",             "3.1.6"
+gem "ruby-oembed",       "0.9.0"
+gem "open_graph_reader", "0.6.1"
 
 # Services
 
-gem 'omniauth',          '1.1.4'
-gem 'omniauth-facebook', '1.4.1'
-gem 'omniauth-tumblr',   '1.1'
-gem 'omniauth-twitter',  '1.0.0'
-gem 'twitter',           '4.8.1'
-gem 'omniauth-wordpress','0.2.0'
+gem "omniauth",           "1.3.1"
+gem "omniauth-facebook",  "3.0.0"
+gem "omniauth-tumblr",    "1.2"
+gem "omniauth-twitter",   "1.2.1"
+gem "twitter",            "5.15.0"
+gem "omniauth-wordpress", "0.2.2"
+
+# Serializers
+
+gem "active_model_serializers", "0.9.3"
+
+# XMPP chat dependencies
+gem "diaspora-vines",             "~> 0.2.0.develop"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
 
 # Tags
 
-gem 'acts-as-taggable-on', '2.4.1'
+gem "acts-as-taggable-on", "3.5.0"
 
 # URIs and HTTP
 
-gem 'addressable',        '2.3.5', :require => 'addressable/uri'
-gem 'faraday',            '0.8.8'
-gem 'faraday_middleware', '0.9.0'
-gem 'typhoeus',           '0.6.3'
+gem "addressable",        "2.3.8", require: "addressable/uri"
+gem "faraday",            "0.9.2"
+gem "faraday_middleware", "0.10.0"
+gem "faraday-cookie_jar", "0.0.6"
+gem "typhoeus",           "0.8.0"
 
 # Views
 
-gem 'client_side_validations', '3.2.5'
-gem 'gon',                     '4.1.1'
-gem 'haml',                    '4.0.3'
-gem 'mobile-fu',               '1.2.1'
-gem 'will_paginate',           '3.0.4'
+gem "gon",                     "6.0.1"
+gem "haml",                    "4.0.7"
+gem "mobile-fu",               "1.3.1"
+gem "will_paginate",           "3.0.7"
+gem "rails-timeago",           "2.11.0"
 
+# Logging
 
-### GROUPS ####
+gem "logging-rails", "0.5.0", require: "logging/rails"
 
-group :assets do
+# Reading and writing zip files
 
-  # Icons
-  gem 'entypo-rails'
+gem "rubyzip", "1.1.7"
 
-  # CSS
+# Prevent occasions where minitest is not bundled in
+# packaged versions of ruby. See following issues/prs:
+# https://github.com/gitlabhq/gitlabhq/issues/3826
+# https://github.com/gitlabhq/gitlabhq/pull/3852
+# https://github.com/discourse/discourse/pull/238
+gem "minitest"
 
-  gem 'bootstrap-sass', '2.2.2.0'
-  gem 'compass-rails',  '1.0.3'
-  gem 'sass-rails',     '3.2.6'
+# Windows and OSX have an execjs compatible runtime built-in, Linux users should
+# install Node.js or use "therubyracer".
+#
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
 
-  # Compression
-
-  gem 'uglifier', '2.1.2'
-
-  # JavaScript
-
-  gem 'handlebars_assets', '0.12.0'
-  gem 'jquery-rails',      '2.1.4'
-
-  # Windows and OSX have an execjs compatible runtime built-in, Linux users should
-  # install Node.js or use 'therubyracer'.
-  #
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-
-  # gem 'therubyracer', :platform => :ruby
-end
-
-group :production do # we don't install these on travis to speed up test runs
+# gem "therubyracer", :platform => :ruby
 
+group :production do # we don"t install these on travis to speed up test runs
   # Administration
 
-  gem 'rails_admin', '0.4.9'
+  gem "rails_admin", "0.8.1"
 
   # Analytics
 
-  gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
-  gem 'rack-piwik',            '0.2.2',  :require => 'rack/piwik'
+  gem "rack-google-analytics", "1.2.0"
+  gem "rack-piwik",            "0.3.0",  require: "rack/piwik"
 
   # Click-jacking protection
 
-  gem 'rack-protection', '1.2'
+  gem "rack-protection", "1.5.3"
 
   # Process management
 
-  gem 'foreman', '0.62'
+  gem "eye", "0.7"
 
   # Redirects
 
-  gem 'rack-rewrite', '1.3.3', :require => false
-  gem 'rack-ssl',     '1.3.3', :require => 'rack/ssl'
+  gem "rack-rewrite", "1.5.1", require: false
+  gem "rack-ssl",     "1.4.1", require: "rack/ssl"
 
   # Third party asset hosting
 
-  gem 'asset_sync', '1.0.0', :require => false
+  gem "asset_sync", "1.1.0", require: false
 end
 
 group :development do
-  # Comparison images
-
-  gem 'rmagick', '2.13.2', :require => false
-
   # Automatic test runs
+  gem "guard-cucumber", "1.5.4"
+  gem "guard-jshintrb", "1.1.1"
+  gem "guard-rspec",    "4.6.4"
+  gem "guard-rubocop",  "1.2.0"
+  gem "guard",          "2.13.0", require: false
+  gem "rb-fsevent",     "0.9.6", require: false
+  gem "rb-inotify",     "0.9.5", require: false
 
-  gem 'guard-cucumber', '1.4.0'
-  gem 'guard-rspec',    '3.0.2'
-  gem 'rb-fsevent',     '0.9.3', :require => false
-  gem 'rb-inotify',     '0.9.0', :require => false
+  # Linters
+  gem "jshintrb", "0.3.0"
+  gem "rubocop",  "0.35.1"
 
   # Preloading environment
 
-  gem 'guard-spork', '1.5.1'
-  gem 'spork',       '1.0.0rc3'
+  gem "spring", "1.6.1"
+  gem "spring-commands-rspec", "1.0.4"
+  gem "spring-commands-cucumber", "1.0.1"
+
+  # Debugging
+  gem "pry"
+  gem "pry-debundle"
+  gem "pry-byebug"
+
+  # test coverage
+  gem "simplecov", "0.11.1", require: false
 end
 
 group :test do
   # RSpec (unit tests, some integration tests)
 
-  gem 'fixture_builder',   '0.3.6'
-  gem 'fuubar',            '1.1.1'
-  gem 'rspec-instafail',   '0.2.4', :require => false
-  gem 'test_after_commit', '0.2.0'
+  gem "fixture_builder",   "0.4.1"
+  gem "fuubar",            "2.0.0"
+  gem "rspec-instafail",   "0.4.0", require: false
+  gem "test_after_commit", "0.4.2"
 
   # Cucumber (integration tests)
 
-  gem 'capybara',           '2.1.0'
-  gem 'database_cleaner',   '1.1.0'
-  gem 'selenium-webdriver', '2.34.0'
+  gem "capybara",           "2.5.0"
+  gem "database_cleaner" ,  "1.5.1"
+  gem "selenium-webdriver", "2.47.1"
 
   # General helpers
 
-  gem 'factory_girl_rails', '4.2.1'
-  gem 'timecop',            '0.6.1'
-  gem 'webmock',            '1.13.0', :require => false
-end
+  gem "factory_girl_rails", "4.5.0"
+  gem "timecop",            "0.8.0"
+  gem "webmock",            "1.22.3", require: false
+  gem "shoulda-matchers",   "3.0.1"
 
+  gem "diaspora_federation-test", "0.0.11"
+end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails",     '2.13.2'
+  gem "rspec-rails",     "3.3.3"
 
   # Cucumber (integration tests)
-  gem 'cucumber-rails',     '1.3.1', :require => false
+  gem "cucumber-rails",     "1.4.2", require: false
 
   # Jasmine (client side application tests (JS))
-  gem 'jasmine', '1.3.2'
-  gem 'sinon-rails',	    '1.7.3'
+  gem "jasmine",                   "2.4.0"
+  gem "jasmine-jquery-rails",      "2.0.3"
+  gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
+  gem "sinon-rails",               "1.15.0"
+
+  # silence assets
+  gem "quiet_assets", "1.1.0"
 end

Guardfile

@@ -1,38 +1,45 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-# also, http://asciicasts.com/episodes/264-guard
-guard 'rspec', :all_on_start => false, :all_after_pass => false do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(/spec\/spec_helper.rb/)  { "spec" }
 
   # Rails example
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^app\/(.+)\.rb$/)                            {|m| "spec/#{m[1]}_spec.rb" }
+  watch(/^lib\/(.+)\.rb$/)                            {|m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) {|m|
+    ["spec/routing/#{m[1]}_routing_spec.rb",
+     "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",
+     "spec/acceptance/#{m[1]}_spec.rb"]
+  }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch("spec/spec_helper.rb")                        { "spec" }
+  watch("config/routes.rb")                           { "spec/routing" }
+  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
+
   # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          {|m| "spec/requests/#{m[1]}_spec.rb" }
 end
 
-guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' }, :all_on_start => false, :all_after_pass => false, :wait => 70 do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch(%r{^config/environments/.+\.rb$})
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('Gemfile')
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb') { :rspec }
-  watch('test/test_helper.rb') { :test_unit }
-  watch(%r{features/support/}) { :cucumber }
+guard(:cucumber,
+      command_prefix: "bin/spring",
+      bundler:        false,
+      all_on_start:   false,
+      all_after_pass: false) do
+  watch(/^features\/.+\.feature$/)
+  watch(%r{^features/support/.+$})          { "features" }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) {|m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "features"
+  }
 end
 
-guard 'cucumber', :all_on_start => false, :all_after_pass => false do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+guard :rubocop, all_on_start: false, keep_failed: false do
+  watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
+  watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
+end
+
+guard :jshintrb do
+  watch(/^app\/assets\/javascripts\/.+\.js$/)
+  watch(/^lib\/assets\/javascripts\/.+\.js$/)
+  watch(/^spec\/javascripts\/.+\.js$/)
 end

Procfile

@@ -1,2 +1,2 @@
-web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
-sidekiq: bundle exec sidekiq
+web: bin/bundle exec unicorn -c config/unicorn.rb -p $PORT
+sidekiq: bin/bundle exec sidekiq

README.md

@@ -1,7 +1,8 @@
-# diaspora* 
-### a privacy aware, distributed, open source social network
+# diaspora*
+### A privacy-aware, distributed, open source social network
 
 **master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
+**stable:** [![Build Status stable](https://secure.travis-ci.org/diaspora/diaspora.png?branch=stable)](http://travis-ci.org/diaspora/diaspora) |
 **develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora) |
 [![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
 [![Code Climate](https://codeclimate.com/github/diaspora/diaspora.png)](https://codeclimate.com/github/diaspora/diaspora)
@@ -31,6 +32,8 @@ Still haven't found an answer? Talk to us! Read [how we communicate](https://wik
 
 To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
 
+Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).
+
 ## Security
 
 Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org](mailto:security@diasporafoundation.org). The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A](http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x6F70243F27AD886A)