Unverified Commit a9c282d9 authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Merge branch 'release/0.6.4.0'

parents 1702cc1c 2c6101fb
Loading
Loading
Loading
Loading
+23 −1
Original line number Diff line number Diff line
@@ -25,6 +25,15 @@ Metrics/ModuleLength:
Metrics/AbcSize:
  Max: 20

# Some blocks are longer.
Metrics/BlockLength:
  ExcludedMethods:
    - "namespace"
    - "create_table"
  Exclude:
    - "config/**/*.rb"
    - "spec/**/*.rb"

# No space makes the method definition shorter and differentiates
# from a regular assignment.
Style/SpaceAroundEqualsInParameterDefault:
@@ -51,7 +60,7 @@ Style/HashSyntax:
 EnforcedStyle: ruby19_no_mixed_keys

# has_key? and has_value? are far more readable than key? and value?
Style/DeprecatedHashMethods:
Style/PreferredHashMethods:
  Enabled: false

# String#% is by far the least verbose and only object oriented variant.
@@ -147,7 +156,20 @@ Style/OpMethod:
Lint/Debugger:
  Enabled: false

# We used comparison everywhere.
Style/NumericPredicate:
  EnforcedStyle: comparison

# Reset some HoundCI changes back to Rubocop defaults
Style/DotPosition:
  EnforcedStyle: leading

### backward compatibility

# only with ruby >= 2.3
Style/FrozenStringLiteralComment:
  Enabled: false

# only with ruby >= 2.4
Performance/RegexpMatch:
  Enabled: false
+23 −0
Original line number Diff line number Diff line
# 0.6.4.0

## Refactor
* Unify link colors [#7318](https://github.com/diaspora/diaspora/pull/7318)
* Increase time to wait before showing the hovercard [#7319](https://github.com/diaspora/diaspora/pull/7319)
* Remove some unused color-theme overrides [#7325](https://github.com/diaspora/diaspora/pull/7325)
* Change color of author-name on hover [#7326](https://github.com/diaspora/diaspora/pull/7326)
* Add like and reshare services [#7337](https://github.com/diaspora/diaspora/pull/7337)

## Bug fixes
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
* Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)
* Remove whitespace from author link [#7330](https://github.com/diaspora/diaspora/pull/7330)
* Fix autosize in modals [#7339](https://github.com/diaspora/diaspora/pull/7339)
* Only display invite link on contacts page if invitations are enabled [#7342](https://github.com/diaspora/diaspora/pull/7342)
* Fix regex for hashtags for some languages [#7350](https://github.com/diaspora/diaspora/pull/7350)
* Create asterisk.png without digest after precompile [#7322](https://github.com/diaspora/diaspora/pull/7322)

## Features
* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)
* Added a link to the community guidelines :) [#7298](https://github.com/diaspora/diaspora/pull/7298)

# 0.6.3.0

## Refactor
+72 −66
Original line number Diff line number Diff line
source "https://rubygems.org"

gem "rails", "4.2.7.1"
gem "rails", "4.2.8"

# Legacy Rails features, remove me!
# responders (class level)
@@ -8,18 +8,18 @@ gem "responders", "2.3.0"

# Appserver

gem "unicorn", "5.1.0", require: false
gem "unicorn", "5.2.0", require: false
gem "unicorn-worker-killer", "0.4.4"

# Federation

gem "diaspora_federation-rails", "0.1.7"
gem "diaspora_federation-rails", "0.1.8"

# API and JSON

gem "acts_as_api", "0.4.3"
gem "json",        "1.8.3"
gem "json-schema", "2.7.0"
gem "acts_as_api", "1.0.0"
gem "json",        "1.8.6"
gem "json-schema", "2.8.0"

# Authentication

@@ -28,19 +28,19 @@ gem "devise_lastseenable", "0.0.6"

# Captcha

gem "simple_captcha2", "0.4.0", require: "simple_captcha"
gem "simple_captcha2", "0.4.3", require: "simple_captcha"

# Background processing

gem "sidekiq", "4.2.2"
gem "sidekiq", "4.2.9"

# Scheduled processing

gem "sidekiq-cron", "0.4.4"
gem "sidekiq-cron", "0.4.5"

# Compression

gem "uglifier", "3.0.2"
gem "uglifier", "3.1.2"

# Configuration

@@ -48,78 +48,78 @@ gem "configurate", "0.3.1"

# Cross-origin resource sharing

gem "rack-cors", "0.4.0", require: "rack/cors"
gem "rack-cors", "0.4.1", require: "rack/cors"

# CSS

gem "autoprefixer-rails",     "6.7.6"
gem "bootstrap-sass",         "3.3.7"
gem "bootstrap-switch-rails", "3.3.3"
gem "compass-rails",          "2.0.5"
gem "sass-rails",             "5.0.6"
gem "autoprefixer-rails", "6.5.1"
gem "bootstrap-switch-rails", "3.3.3"

# Database

group :mysql, optional: true do
  gem "mysql2", "0.4.4"
  gem "mysql2", "0.4.5"
end
group :postgresql, optional: true do
  gem "pg",     "0.19.0"
end


gem "activerecord-import", "0.15.0"
gem "activerecord-import", "0.17.1"

# File uploading

gem "fog",         "1.38.0", require: "fog/aws"
gem "fog-aws",     "1.2.1"
gem "carrierwave", "0.11.2"
gem "mini_magick", "4.5.1"
gem "mini_magick", "4.6.1"

# GUID generation
gem "uuid", "2.3.8"

# Icons

gem "entypo-rails", "3.0.0.pre.rc2"
gem "entypo-rails", "3.0.0"

# JavaScript

gem "handlebars_assets", "0.23.1"
gem "jquery-rails",      "4.2.1"
gem "jquery-ui-rails",   "5.0.5"
gem "js-routes",         "1.3.3"
gem "js_image_paths",    "0.1.0"
gem "js-routes",         "1.2.9"

source "https://rails-assets.org" do
  gem "rails-assets-jquery",                              "2.2.4" # Should be kept in sync with jquery-rails

  gem "rails-assets-markdown-it",                         "8.2.2"
  gem "rails-assets-highlightjs",                         "9.9.0"
  gem "rails-assets-markdown-it",                         "8.3.0"
  gem "rails-assets-markdown-it-hashtag",                 "0.4.0"
  gem "rails-assets-markdown-it-diaspora-mention",        "1.1.0"
  gem "rails-assets-markdown-it-diaspora-mention",        "1.1.1"
  gem "rails-assets-markdown-it-sanitizer",               "0.4.3"
  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.7.0"

  gem "rails-assets-backbone",                            "1.3.3"
  gem "rails-assets-bootstrap-markdown",                  "2.10.0"
  gem "rails-assets-corejs-typeahead",                    "1.0.1"
  gem "rails-assets-fineuploader-dist",                   "5.11.0"
  gem "rails-assets-corejs-typeahead",                    "1.1.1"
  gem "rails-assets-fine-uploader",                       "5.13.0"

  # jQuery plugins

  gem "rails-assets-autosize",                            "3.0.20"
  gem "rails-assets-blueimp-gallery",                     "2.25.0"
  gem "rails-assets-jquery-placeholder",                  "2.3.1"
  gem "rails-assets-jquery-textchange",                   "0.2.3"
  gem "rails-assets-perfect-scrollbar",             "0.6.12"
  gem "rails-assets-autosize",                      "3.0.20"
  gem "rails-assets-blueimp-gallery",               "2.21.3"
  gem "rails-assets-perfect-scrollbar",                   "0.6.16"
end

# Localization

gem "http_accept_language", "2.0.5"
gem "http_accept_language", "2.1.0"
gem "i18n-inflector-rails", "1.0.7"
gem "rails-i18n",           "4.0.8"

@@ -132,11 +132,11 @@ gem "leaflet-rails", "0.7.7"

# Parsing

gem "nokogiri",          "1.6.8.1"
gem "redcarpet",         "3.3.4"
gem "twitter-text",      "1.14.0"
gem "nokogiri",          "1.7.0.1"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet",         "3.4.0"
gem "ruby-oembed",       "0.10.1"
gem "open_graph_reader", "0.6.1"
gem "twitter-text",      "1.14.5"

# RTL support

@@ -144,15 +144,15 @@ gem "string-direction", "1.2.0"

# Security Headers

gem "secure_headers", "3.5.0"
gem "secure_headers", "3.6.1"

# Services

gem "omniauth",           "1.3.1"
gem "omniauth",           "1.4.2"
gem "omniauth-facebook",  "4.0.0"
gem "omniauth-tumblr",    "1.2"
gem "omniauth-twitter",   "1.2.1"
gem "twitter",            "5.16.0"
gem "omniauth-twitter",   "1.4.0"
gem "twitter",            "6.1.0"
gem "omniauth-wordpress", "0.2.2"

# OpenID Connect
@@ -172,16 +172,16 @@ gem "acts-as-taggable-on", "3.5.0"

# URIs and HTTP

gem "addressable",        "2.4.0", require: "addressable/uri"
gem "faraday",            "0.9.2"
gem "faraday_middleware", "0.10.0"
gem "addressable",        "2.5.0", require: "addressable/uri"
gem "faraday",            "0.11.0" # also update User-Agent in OpenID specs
gem "faraday_middleware", "0.11.0.1"
gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus",           "1.1.0"
gem "typhoeus",           "1.1.2"

# Views

gem "gon",                     "6.1.0"
gem "hamlit",                  "2.7.5"
gem "hamlit",                  "2.8.0"
gem "mobile-fu",               "1.3.1"
gem "will_paginate",           "3.1.5"
gem "rails-timeago",           "2.11.0"
@@ -192,7 +192,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"

# Reading and writing zip files

gem "rubyzip", "1.2.0", require: "zip"
gem "rubyzip", "1.2.1", require: "zip"

# Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs:
@@ -203,6 +203,12 @@ gem "minitest"

gem "versionist", "1.5.0"

# Prevent accidental upgrades of thor
# TODO: remove this when either all gems depending on thor have fixed the warnings
#       or thor released a version where they are clearly marked as warnings
# see: https://github.com/erikhuda/thor/issues/538
gem "thor", "0.19.1"

# Windows and OSX have an execjs compatible runtime built-in, Linux users should
# install Node.js or use "therubyracer".
#
@@ -222,7 +228,7 @@ group :production do # we don"t install these on travis to speed up test runs

  # Process management

  gem "eye", "0.8.1"
  gem "eye", "0.9.1"

  # Redirects

@@ -231,30 +237,30 @@ group :production do # we don"t install these on travis to speed up test runs

  # Third party asset hosting

  gem "asset_sync", "1.1.0", require: false
  gem "asset_sync", "2.0.0", require: false
end

group :development do
  # Automatic test runs
  gem "guard",          "2.14.0", require: false
  gem "guard",          "2.14.1", require: false
  gem "guard-cucumber", "2.1.2", require: false
  gem "guard-rspec",    "4.7.3", require: false
  gem "guard-rubocop",  "1.2.0", require: false
  gem "rb-fsevent",     "0.9.7", require: false
  gem "rb-inotify",     "0.9.7", require: false
  gem "rb-fsevent",     "0.9.8", require: false
  gem "rb-inotify",     "0.9.8", require: false

  # Linters
  gem "rubocop",        "0.40.0"
  gem "haml_lint",      "0.18.2"
  gem "pronto",         "0.7.1"
  gem "pronto-eslint",  "0.7.0"
  gem "pronto-rubocop", "0.7.0"
  gem "pronto-haml",    "0.7.0"
  gem "pronto-scss",    "0.7.0", require: false
  gem "haml_lint",      "0.21.0"
  gem "pronto",         "0.8.2"
  gem "pronto-eslint",  "0.8.0"
  gem "pronto-haml",    "0.8.0"
  gem "pronto-rubocop", "0.8.0"
  gem "pronto-scss",    "0.8.0", require: false
  gem "rubocop",        "0.47.1"

  # Preloading environment

  gem "spring", "2.0.0"
  gem "spring", "2.0.1"
  gem "spring-commands-rspec", "1.0.4"
  gem "spring-commands-cucumber", "1.0.1"

@@ -277,21 +283,21 @@ group :test do

  # Cucumber (integration tests)

  gem "capybara",           "2.10.1"
  gem "capybara",           "2.12.1"
  gem "database_cleaner",   "1.5.3"
  gem "poltergeist",        "1.11.0"
  gem "poltergeist",        "1.13.0"

  gem "cucumber-api-steps", "0.13", require: false
  gem "json_spec", "1.1.4"

  # General helpers

  gem "factory_girl_rails", "4.7.0"
  gem "factory_girl_rails", "4.8.0"
  gem "timecop",            "0.8.1"
  gem "webmock",            "2.1.0", require: false
  gem "webmock",            "2.3.2", require: false
  gem "shoulda-matchers",   "3.1.1"

  gem "diaspora_federation-test", "0.1.7"
  gem "diaspora_federation-test", "0.1.8"

  # Coverage
  gem 'coveralls', require: false
@@ -305,9 +311,9 @@ group :development, :test do
  gem "cucumber-rails", "1.4.5", require: false

  # Jasmine (client side application tests (JS))
  gem "jasmine",                   "2.5.1"
  gem "jasmine",                   "2.5.2"
  gem "jasmine-jquery-rails",      "2.0.3"
  gem "rails-assets-jasmine-ajax", "3.2.0", source: "https://rails-assets.org"
  gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org"
  gem "sinon-rails",               "1.15.0"

  # silence assets
+252 −370

File changed.

Preview size limit exceeded, changes collapsed.

+10 −0
Original line number Diff line number Diff line
<svg xmlns="http://www.w3.org/2000/svg" width="83" height="30">
  <rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/>
  <svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7">
    <g transform="translate(-78.37-208.06)" fill="#1a171b">
      <path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/>
      <path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/>
    </g>
  </svg>
  <text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif" font-weight="700" font-size="14" x="50" y="20">Donate</text>
</svg>
Loading