Merge branch 'release/0.7.0.0'

# Configuration files

# Configuration files

config/diaspora.yml

config/diaspora.yml

config/heroku.yml

config/initializers/secret_token.rb

config/initializers/secret_token.rb

config/redis.conf

config/deploy_config.yml

config/schedule.rb

.bundle

.bundle

vendor/bundle/

vendor/bundle/

vendor/cache/

vendor/cache/

config/database.yml

config/database.yml

.rvmrc_custom

.rvmrc.local

config/oidc_key.pem

config/oidc_key.pem

# Mailing list stuff

config/email_offset

config/mailing_list.csv

# Generated files

# Generated files

log/

log/

public/stylesheets/*.css

public/diaspora

spec/fixtures/*.y*ml

spec/fixtures/*.y*ml

spec/fixtures/*.fixture.*

spec/fixtures/*.fixture.*

coverage/

coverage/

public/422.html

public/422.html

public/500.html

public/500.html

# the db/schema.rb. Although this is contrary to rails best-practises, we

# cannot provide a schema.rb that works for both MySQL and PostgreSQL, so we

# have no choice. Our migrations are maintained, so it should always be

# possible to get back to a "clean" database schema anyway.

db/schema.rb

# Sprites

# Sprites

app/assets/images/branding-*.png

app/assets/images/branding-*.png

app/assets/images/branding/logos-*.png

app/assets/images/branding/logos-*.png

public/uploads/

public/uploads/

public/assets/

public/assets/

public/source.tar*

public/source.tar*

public/.well-known

tmp/**/

tmp/

tmp/

*.sqlite3

# Temporary files of every sort

# Temporary files of every sort

.sass-cache/

.sass-cache/

.DS_Store

.DS_Store

.idea

.idea

.redcar

.redcar

.rvmrc

.stgit*

.stgit*

*.swap

*.swap

*.swo

*.swo

nbproject

nbproject

patches-*

patches-*

capybara-*.html

capybara-*.html

dump.rdb

# Rubinius's JIT

# Rubinius's JIT

*.rbc

*.rbc

# No space makes the method definition shorter and differentiates

# No space makes the method definition shorter and differentiates

# from a regular assignment.

# from a regular assignment.

Style/SpaceAroundEqualsInParameterDefault:

Layout/SpaceAroundEqualsInParameterDefault:

  EnforcedStyle: no_space

  EnforcedStyle: no_space

# Single quotes being faster is hardly measurable and only affects parse time.

# Single quotes being faster is hardly measurable and only affects parse time.

  Enabled: true

  Enabled: true

# Most readable form.

# Most readable form.

Style/AlignHash:

Layout/AlignHash:

  EnforcedHashRocketStyle: table

  EnforcedHashRocketStyle: table

  EnforcedColonStyle: table

  EnforcedColonStyle: table

# Indenting the chained dots beneath each other is not supported by this cop,

# Indenting the chained dots beneath each other is not supported by this cop,

# see https://github.com/bbatsov/rubocop/issues/1633

# see https://github.com/bbatsov/rubocop/issues/1633

Style/MultilineOperationIndentation:

Layout/MultilineOperationIndentation:

  Enabled: false

  Enabled: false

# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.

# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.

Lint/HandleExceptions:

Lint/HandleExceptions:

  Enabled: false

  Enabled: false

Style/SpaceInsideBlockBraces:

Layout/SpaceInsideBlockBraces:

  # The space here provides no real gain in readability while consuming

  # The space here provides no real gain in readability while consuming

  # horizontal space that could be used for a better parameter name.

  # horizontal space that could be used for a better parameter name.

  # Also {| differentiates better from a hash than { | does.

  # Also {| differentiates better from a hash than { | does.

# No trailing space differentiates better from the block:

# No trailing space differentiates better from the block:

# foo} means hash, foo } means block.

# foo} means hash, foo } means block.

Style/SpaceInsideHashLiteralBraces:

Layout/SpaceInsideHashLiteralBraces:

  EnforcedStyle: no_space

  EnforcedStyle: no_space

# { ... } for multi-line blocks is okay, follow Weirichs rule instead:

# { ... } for multi-line blocks is okay, follow Weirichs rule instead:

  EnforcedStyle: comparison

  EnforcedStyle: comparison

# Reset some HoundCI changes back to Rubocop defaults

# Reset some HoundCI changes back to Rubocop defaults

Style/DotPosition:

Layout/DotPosition:

  EnforcedStyle: leading

  EnforcedStyle: leading

### backward compatibility

### backward compatibility

2.3

2.4

language: ruby

language: ruby

rvm:

rvm:

  - 2.3.1

  - 2.4.1

  - 2.1

  - 2.3.4

env:

env:

  - DB=postgresql BUILD_TYPE=cucumber

  - DB=postgresql BUILD_TYPE=cucumber

  bundler: true

  bundler: true

  directories:

  directories:

    - app/assets/images

    - app/assets/images

    - tmp/cache/assets

branches:

branches:

  only:

  only:

  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs

  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs

  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH

  - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH

bundler_args: "--deployment --without development production --with mysql postgresql --jobs 3 --retry 3"

bundler_args: "--deployment --without development --with mysql postgresql --jobs 3 --retry 3"

script: "./script/ci/build.sh"

script: "./script/ci/build.sh"

# Contributing to diaspora\*

First of all: thank you very much for helping us out!

## Things you need to know before contributing

If you want to get in touch with other diaspora\* developers, [check our wiki][how-we-communicate] for information on how we communicate. Feel free to ask if you have any questions!

Everyone interacting with our code, issue trackers, chat rooms, mailing lists, the wiki, and the discourse forum is expected to follow the [diaspora\* code of conduct][code-of-conduct].

## Report a security issue

Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org][sec-mail]. The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A][pgp].

## Contributing to translations

We use [WebTranslateIt][webtranslateit] to manage translations of the app interface. Please read [our wiki page][translation-wiki] to find out more about this. If your language is featured on WebTranslateIt, please do **not** open a pull request to update translations. If it is not already featured on WebTranslateIt, please read the wiki article above to find out how to proceed.

## Contributing to the code

**Before opening a pull request** please read [how to contribute][contribute]. Doing things the right way from the start will save us time and mean that your contribution can be integrated quicker!

- Follow our [git workflow][git-workflow] method. In particular, *do not* open a pull request from the `master` or the `develop` branch.

- Follow our [styleguide][styleguide] and run pronto, our syntax analyzer, **locally before opening a pull request**. See [our wiki][pronto] for information on how to do this.

- [Write tests][testing-workflow].

- Use meaningful commit-messages and split larger tasks, e.g. refactoring, into separate commits. This makes the review process much easier.

## Other ways to contribute

You don’t know code? No worries, there are plenty other ways to help the diaspora* project! Please find out how you can help [on our wiki][other-ways].

[code-of-conduct]: https://github.com/diaspora/diaspora/blob/develop/CODE_OF_CONDUCT.md

[how-we-communicate]: https://wiki.diasporafoundation.org/How_we_communicate

[pgp]: https://pgp.mit.edu/pks/lookup?op=get&search=0x6F70243F27AD886A

[sec-mail]: mailto:security@diasporafoundation.org

[webtranslateit]: https://webtranslateit.com/en/projects/3020-Diaspora

[translation-wiki]: https://wiki.diasporafoundation.org/Contribute_translations

[contribute]: https://wiki.diasporafoundation.org/Getting_started_with_contributing

[git-workflow]: https://wiki.diasporafoundation.org/Git_Workflow

[styleguide]: https://wiki.diasporafoundation.org/Styleguide

[pronto]: https://wiki.diasporafoundation.org/Styleguide#Automatic_local_review

[testing-workflow]: https://wiki.diasporafoundation.org/Testing_Workflow

[other-ways]: https://wiki.diasporafoundation.org/Other_ways_to_contribute