Unverified Commit 914fbcde authored by Jonne Haß's avatar Jonne Haß
Browse files

Merge branch 'master' into stable

parents 8cd3f31d 0a77f045

Changelog.md

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


## Features



# 0.5.10.2



Update to Rails 4.2.7.1 which fixes [CVE-2016-6316](https://groups.google.com/forum/#!topic/ruby-security-ann/8B2iV2tPRSE) and [CVE-2016-6317](https://groups.google.com/forum/#!topic/ruby-security-ann/WccgKSKiPZA).



# 0.5.10.1



We made a mistake and removed `mysql2` from the `Gemfile.lock` in a recent gem update. Since this could cause some issues for some installations, we decided to release a hotfix.

Gemfile

+1 −1
Original line number Diff line number Diff line 
source "https://rubygems.org"



gem "rails", "4.2.6"

gem "rails", "4.2.7.1"



# Legacy Rails features, remove me!

# responders (class level)

Gemfile.lock

+31 −31
Original line number Diff line number Diff line
@@ -3,40 +3,40 @@ GEM 
  remote: https://rails-assets.org/

  specs:

    CFPropertyList (2.3.2)

    actionmailer (4.2.6)

      actionpack (= 4.2.6)

      actionview (= 4.2.6)

      activejob (= 4.2.6)

    actionmailer (4.2.7.1)

      actionpack (= 4.2.7.1)

      actionview (= 4.2.7.1)

      activejob (= 4.2.7.1)

      mail (~> 2.5, >= 2.5.4)

      rails-dom-testing (~> 1.0, >= 1.0.5)

    actionpack (4.2.6)

      actionview (= 4.2.6)

      activesupport (= 4.2.6)

    actionpack (4.2.7.1)

      actionview (= 4.2.7.1)

      activesupport (= 4.2.7.1)

      rack (~> 1.6)

      rack-test (~> 0.6.2)

      rails-dom-testing (~> 1.0, >= 1.0.5)

      rails-html-sanitizer (~> 1.0, >= 1.0.2)

    actionview (4.2.6)

      activesupport (= 4.2.6)

    actionview (4.2.7.1)

      activesupport (= 4.2.7.1)

      builder (~> 3.1)

      erubis (~> 2.7.0)

      rails-dom-testing (~> 1.0, >= 1.0.5)

      rails-html-sanitizer (~> 1.0, >= 1.0.2)

    active_model_serializers (0.9.5)

      activemodel (>= 3.2)

    activejob (4.2.6)

      activesupport (= 4.2.6)

    activejob (4.2.7.1)

      activesupport (= 4.2.7.1)

      globalid (>= 0.3.0)

    activemodel (4.2.6)

      activesupport (= 4.2.6)

    activemodel (4.2.7.1)

      activesupport (= 4.2.7.1)

      builder (~> 3.1)

    activerecord (4.2.6)

      activemodel (= 4.2.6)

      activesupport (= 4.2.6)

    activerecord (4.2.7.1)

      activemodel (= 4.2.7.1)

      activesupport (= 4.2.7.1)

      arel (~> 6.0)

    activerecord-import (0.13.0)

      activerecord (>= 3.0)

    activesupport (4.2.6)

    activesupport (4.2.7.1)

      i18n (~> 0.7)

      json (~> 1.7, >= 1.7.7)

      minitest (~> 5.1)
@@ -349,7 +349,7 @@ GEM 
      rspec (~> 3.0)

      ruby-progressbar (~> 1.4)

    gherkin (4.0.0)

    globalid (0.3.6)

    globalid (0.3.7)

      activesupport (>= 4.1.0)

    gon (6.0.1)

      actionpack (>= 3.0)
@@ -547,16 +547,16 @@ GEM 
      rack

    rack-test (0.6.3)

      rack (>= 1.0)

    rails (4.2.6)

      actionmailer (= 4.2.6)

      actionpack (= 4.2.6)

      actionview (= 4.2.6)

      activejob (= 4.2.6)

      activemodel (= 4.2.6)

      activerecord (= 4.2.6)

      activesupport (= 4.2.6)

    rails (4.2.7.1)

      actionmailer (= 4.2.7.1)

      actionpack (= 4.2.7.1)

      actionview (= 4.2.7.1)

      activejob (= 4.2.7.1)

      activemodel (= 4.2.7.1)

      activerecord (= 4.2.7.1)

      activesupport (= 4.2.7.1)

      bundler (>= 1.3.0, < 2.0)

      railties (= 4.2.6)

      railties (= 4.2.7.1)

      sprockets-rails

    rails-assets-diaspora_jsxc (0.1.4)

      rails-assets-favico.js (~> 0.3.9)
@@ -621,9 +621,9 @@ GEM 
      remotipart (~> 1.0)

      safe_yaml (~> 1.0)

      sass-rails (>= 4.0, < 6)

    railties (4.2.6)

      actionpack (= 4.2.6)

      activesupport (= 4.2.6)

    railties (4.2.7.1)

      actionpack (= 4.2.7.1)

      activesupport (= 4.2.7.1)

      rake (>= 0.8.7)

      thor (>= 0.18.1, < 2.0)

    rainbow (2.1.0)
@@ -863,7 +863,7 @@ DEPENDENCIES 
  rack-protection (= 1.5.3)

  rack-rewrite (= 1.5.1)

  rack-ssl (= 1.4.1)

  rails (= 4.2.6)

  rails (= 4.2.7.1)

  rails-assets-diaspora_jsxc (= 0.1.4)!

  rails-assets-highlightjs (= 9.4.0)!

  rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!