Unverified Commit 2b3bbc1a authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.7.6.0'

parents 42ceb8b3 097754e4

.rubocop.yml

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ AllCops: 
  Exclude:

    - "bin/**/*"

    - "db/schema.rb"

    - "config/locales/cldr/plurals.rb"



Rails:

  Enabled: true

Changelog.md

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



## Refactor

* Add unique index to poll participations on `poll_id` and `author_id` [#7798](https://github.com/diaspora/diaspora/pull/7798)

* Add 'completed at' date to account migrations [#7805](https://github.com/diaspora/diaspora/pull/7805)

* Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807)

* Add link to the pod in the email footer [#7814](https://github.com/diaspora/diaspora/pull/7814)



## Bug fixes

* Fix compatibility with newer glibc versions [#7828](https://github.com/diaspora/diaspora/pull/7828)

* Allow fonts to be served from asset host in CSP [#7825](https://github.com/diaspora/diaspora/pull/7825)



## Features

* Support fetching StatusMessage by Poll GUID [#7815](https://github.com/diaspora/diaspora/pull/7815)

* Always include link to diaspora in facebook cross-posts [#7774](https://github.com/diaspora/diaspora/pull/7774)



# 0.7.5.0



## Refactor

Gemfile.lock

+4 −4
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ GEM 
      to_regexp (~> 0.2.1)

    jwt (1.5.6)

    kgio (2.11.2)

    kostya-sigar (2.0.0)

    kostya-sigar (2.0.4)

    leaflet-rails (1.3.1)

      rails (>= 4.2.0)

    listen (3.1.5)
@@ -475,7 +475,7 @@ GEM 
      byebug (~> 10.0)

      pry (~> 0.10)

    public_suffix (3.0.2)

    rack (2.0.4)

    rack (2.0.5)

    rack-cors (1.0.2)

    rack-google-analytics (1.2.0)

      actionpack
@@ -669,7 +669,7 @@ GEM 
      spring (>= 0.9.1)

    spring-commands-rspec (1.0.4)

      spring (>= 0.9.1)

    sprockets (3.7.1)

    sprockets (3.7.2)

      concurrent-ruby (~> 1.0)

      rack (> 1, < 3)

    sprockets-rails (3.2.1)
@@ -906,4 +906,4 @@ DEPENDENCIES 
  will_paginate (= 3.1.6)



BUNDLED WITH

   1.16.1
 
   1.16.2

README.md

+3 −4
Original line number Diff line number Diff line 
# diaspora*

# diaspora\*

### A privacy-aware, distributed, open source social network



**master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=master)](http://travis-ci.org/diaspora/diaspora)
@@ -6,7 +6,6 @@ 
[![Coverage Status next-minor](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=next-minor)](https://coveralls.io/github/diaspora/diaspora?branch=next-minor)|

**develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.svg?branch=develop)](http://travis-ci.org/diaspora/diaspora)

[![Coverage Status develop](https://coveralls.io/repos/github/diaspora/diaspora/badge.svg?branch=develop)](https://coveralls.io/github/diaspora/diaspora?branch=develop) |

[![Dependency Status](https://gemnasium.com/badges/github.com/diaspora/diaspora.svg)](https://gemnasium.com/diaspora/diaspora)

[![Code Climate](https://codeclimate.com/github/diaspora/diaspora/badges/gpa.svg)](https://codeclimate.com/github/diaspora/diaspora)



[Project site](https://diasporafoundation.org) |
@@ -18,9 +17,9 @@ 


## Installation



You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our [tips for finding a home](https://wiki.diasporafoundation.org/Choosing_a_pod), or you can just go straight to the [list of open servers](http://podupti.me) to sign up.

You don't have to install diaspora\* to use the network. There are many servers connected to diaspora\*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our [tips for finding a home](https://wiki.diasporafoundation.org/Choosing_a_pod), or you can just go straight to the [list of open servers](http://podupti.me) to sign up.



Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our [installation guides](https://wiki.diasporafoundation.org/Installation) will get you started!

Want to own your data and install diaspora\*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our [installation guides](https://wiki.diasporafoundation.org/Installation) will get you started!



## Questions?

app/models/account_migration.rb

+6 −1
Original line number Diff line number Diff line
@@ -40,10 +40,11 @@ class AccountMigration < ApplicationRecord 


    dispatch if locally_initiated?

    dispatch_contacts if remotely_initiated?

    update(completed_at: Time.zone.now)

  end



  def performed?

    old_person.closed_account?

    !completed_at.nil?

  end



  # We assume that migration message subscribers are people that are subscribed to a new user profile updates.
@@ -193,6 +194,10 @@ class AccountMigration < ApplicationRecord 
      .joins("INNER JOIN contacts as c2 ON (contacts.person_id = c2.person_id AND contacts.user_id=#{old_user.id} AND"\

        " c2.user_id=#{new_user.id})")

      .destroy_all

    TagFollowing

      .joins("INNER JOIN tag_followings as t2 ON (tag_followings.tag_id = t2.tag_id AND"\

        " tag_followings.user_id=#{old_user.id} AND t2.user_id=#{new_user.id})")

      .destroy_all

  end



  def update_person_references