Commit ff6f437c authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'release/0.5.2.0'

parents 8624ebb9 c0a0f5e0
......@@ -31,3 +31,5 @@ notifications:
irc:
channels:
- "irc.freenode.org:6667#diaspora-dev"
template:
- "%{repository_slug}#%{commit} (%{branch} - %{commit_subject}): %{message} %{build_url}"
# 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
......
source "https://rubygems.org"
gem "rails", "4.2.2"
gem "rails", "4.2.3"
# Legacy Rails features, remove me!
# caches_page
gem "actionpack-action_caching"
gem "actionpack-page_caching"
# responders (class level)
gem "responders", "2.1.0"
......@@ -15,16 +10,20 @@ gem "responders", "2.1.0"
gem "unicorn", "4.9.0", require: false
# Federation
gem "diaspora_federation-rails", "0.0.3"
# API and JSON
gem "acts_as_api", "0.4.2"
gem "json", "1.8.2"
gem "json", "1.8.3"
# Authentication
gem "devise", "3.4.1"
gem "devise", "3.5.1"
gem "devise_lastseenable", "0.0.4"
gem "devise-token_authenticatable", "~> 0.3.0"
gem "devise-token_authenticatable", "~> 0.4.0"
# Captcha
......@@ -32,7 +31,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
# Background processing
gem "sidekiq", "3.3.4"
gem "sidekiq", "3.4.1"
gem "sinatra", "1.4.6"
# Scheduled processing
......@@ -56,26 +55,26 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "2.3.2.2"
gem "compass-rails", "2.0.4"
gem "sass-rails", "5.0.1"
gem "autoprefixer-rails", "5.1.11"
gem "autoprefixer-rails", "5.2.1"
# Database
ENV["DB"] ||= "mysql"
gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
gem "pg", "0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem "pg", "0.18.2" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem "activerecord-import", "0.7.0"
gem "activerecord-import", "0.8.0"
# File uploading
gem "carrierwave", "0.10.0"
gem "fog", "1.30.0"
gem "mini_magick", "4.2.3"
gem "fog", "1.31.0"
gem "mini_magick", "4.2.7"
gem "remotipart", "1.2.1"
# GUID generation
gem "uuid", "2.3.7"
gem "uuid", "2.3.8"
# Icons
......@@ -83,32 +82,31 @@ gem "entypo-rails", "2.2.3"
# JavaScript
gem "backbone-on-rails", "1.1.2.1"
gem "handlebars_assets", "0.20.1"
gem "jquery-rails", "4.0.4"
gem "jquery-ui-rails", "5.0.3"
gem "js_image_paths", "0.0.2"
gem "js-routes", "1.0.1"
gem "backbone-on-rails", "1.1.2.1"
gem "handlebars_assets", "0.20.2"
gem "jquery-rails", "4.0.4"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
gem "js-routes", "1.0.1"
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", "4.2.1"
gem "rails-assets-markdown-it", "4.4.0"
gem "rails-assets-markdown-it-hashtag", "0.3.1"
gem "rails-assets-markdown-it-diaspora-mention", "0.3.0"
gem "rails-assets-markdown-it-sanitizer", "0.3.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", "8.5.0"
gem "rails-assets-highlightjs", "8.6.0"
# jQuery plugins
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
gem "rails-assets-jquery-idletimer", "1.0.1"
gem "rails-assets-jquery-placeholder", "2.1.1"
gem "rails-assets-jquery-placeholder", "2.1.2"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.5.9"
gem "rails-assets-perfect-scrollbar", "0.6.3"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
end
......@@ -128,7 +126,7 @@ gem "messagebus_ruby_api", "1.0.3"
# Parsing
gem "nokogiri", "1.6.6.2"
gem "redcarpet", "3.2.3"
gem "redcarpet", "3.3.2"
gem "twitter-text", "1.12.0"
gem "roxml", "3.1.6"
gem "ruby-oembed", "0.8.14"
......@@ -161,7 +159,7 @@ gem "addressable", "2.3.8", require: "addressable/uri"
gem "faraday", "0.9.1"
gem "faraday_middleware", "0.9.1"
gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "0.7.1"
gem "typhoeus", "0.7.2"
# Views
......@@ -196,7 +194,7 @@ gem "minitest"
group :production do # we don"t install these on travis to speed up test runs
# Administration
gem "rails_admin", "0.6.7"
gem "rails_admin", "0.6.8"
# Analytics
......@@ -225,19 +223,19 @@ group :development do
# Automatic test runs
gem "guard-cucumber", "1.5.4"
gem "guard-jshintrb", "1.1.1"
gem "guard-rspec", "4.5.0"
gem "guard-rspec", "4.5.2"
gem "guard-rubocop", "1.2.0"
gem "guard", "2.12.5", require: false
gem "rb-fsevent", "0.9.4", require: false
gem "rb-fsevent", "0.9.5", require: false
gem "rb-inotify", "0.9.5", require: false
# Linters
gem "jshintrb", "0.3.0"
gem "rubocop", "0.31.0"
gem "rubocop", "0.32.0"
# Preloading environment
gem "spring", "1.3.5"
gem "spring", "1.3.6"
gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1"
......@@ -272,14 +270,14 @@ group :test do
# General helpers
gem "factory_girl_rails", "4.5.0"
gem "timecop", "0.7.3"
gem "timecop", "0.7.4"
gem "webmock", "1.21.0", require: false
gem "shoulda-matchers", "2.8.0", require: false
end
group :development, :test do
# RSpec (unit tests, some integration tests)
gem "rspec-rails", "3.2.1"
gem "rspec-rails", "3.3.2"
# Cucumber (integration tests)
gem "cucumber-rails", "1.4.2", require: false
......@@ -287,8 +285,8 @@ group :development, :test do
# Jasmine (client side application tests (JS))
gem "jasmine", "2.2.0"
gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
gem "sinon-rails", "1.10.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"
......
......@@ -3,44 +3,40 @@ GEM
remote: https://rails-assets.org/
specs:
CFPropertyList (2.3.1)
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.2)
actionview (= 4.2.2)
activesupport (= 4.2.2)
actionpack (4.2.3)
actionview (= 4.2.3)
activesupport (= 4.2.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionpack-action_caching (1.1.1)
actionpack (>= 4.0.0, < 5.0)
actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5)
actionview (4.2.2)
activesupport (= 4.2.2)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_model_serializers (0.9.3)
activemodel (>= 3.2)
activejob (4.2.2)
activesupport (= 4.2.2)
activejob (4.2.3)
activesupport (= 4.2.3)
globalid (>= 0.3.0)
activemodel (4.2.2)
activesupport (= 4.2.2)
activemodel (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
activerecord (4.2.2)
activemodel (= 4.2.2)
activesupport (= 4.2.2)
activerecord (4.2.3)
activemodel (= 4.2.3)
activesupport (= 4.2.3)
arel (~> 6.0)
activerecord-import (0.7.0)
activerecord-import (0.8.0)
activerecord (>= 3.0)
activesupport (4.2.2)
activesupport (4.2.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
......@@ -61,7 +57,7 @@ GEM
ast (2.0.0)
astrolabe (1.3.0)
parser (>= 2.2.0.pre.3, < 3.0)
autoprefixer-rails (5.1.11)
autoprefixer-rails (5.2.1)
execjs
json
backbone-on-rails (1.1.2.1)
......@@ -124,7 +120,7 @@ GEM
connection_pool (2.2.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
cucumber (1.3.19)
cucumber (1.3.20)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
......@@ -137,15 +133,15 @@ GEM
nokogiri (~> 1.5)
rails (>= 3, < 5)
database_cleaner (1.4.1)
devise (3.4.1)
devise (3.5.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-token_authenticatable (0.3.0)
devise (~> 3.4.0)
devise-token_authenticatable (0.4.0)
devise (~> 3.5.0)
devise_lastseenable (0.0.4)
devise
rails (>= 3.0.4)
......@@ -157,6 +153,11 @@ GEM
eventmachine (>= 1.0.5, < 1.1)
http_parser.rb (~> 0.6)
nokogiri (~> 1.6)
diaspora_federation (0.0.3)
nokogiri (~> 1.6, >= 1.6.6)
diaspora_federation-rails (0.0.3)
diaspora_federation (= 0.0.3)
rails (~> 4.2)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
......@@ -174,7 +175,7 @@ GEM
railties (>= 3.1, <= 5)
equalizer (0.0.11)
erubis (2.7.0)
ethon (0.7.3)
ethon (0.7.4)
ffi (>= 1.3.0)
eventmachine (1.0.7)
excon (0.45.3)
......@@ -206,11 +207,11 @@ GEM
fixture_builder (0.4.1)
activerecord (>= 2)
activesupport (>= 2)
fog (1.30.0)
fog (1.31.0)
fog-atmos
fog-aws (~> 0.0)
fog-brightbox (~> 0.4)
fog-core (~> 1.27, >= 1.27.4)
fog-core (~> 1.30)
fog-ecloud
fog-google (>= 0.0.2)
fog-json
......@@ -232,7 +233,7 @@ GEM
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (0.1.2)
fog-aws (0.5.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
......@@ -241,30 +242,30 @@ GEM
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
fog-core (1.30.0)
fog-core (1.31.1)
builder
excon (~> 0.45)
formatador (~> 0.2)
mime-types
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
fog-ecloud (0.1.1)
fog-ecloud (0.1.3)
fog-core
fog-xml
fog-google (0.0.5)
fog-core
fog-json
fog-xml
fog-json (1.0.1)
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.0)
multi_json (~> 1.10)
fog-local (0.2.1)
fog-core (~> 1.27)
fog-powerdns (0.1.1)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
fog-profitbricks (0.0.2)
fog-profitbricks (0.0.3)
fog-core
fog-xml
nokogiri
......@@ -282,7 +283,7 @@ GEM
fog-serverlove (0.1.2)
fog-core
fog-json
fog-softlayer (0.4.5)
fog-softlayer (0.4.6)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
......@@ -332,7 +333,7 @@ GEM
guard-jshintrb (1.1.1)
guard (~> 2.0)
jshintrb
guard-rspec (4.5.0)
guard-rspec (4.5.2)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
......@@ -341,12 +342,12 @@ GEM
rubocop (~> 0.20)
haml (4.0.6)
tilt
handlebars_assets (0.20.1)
handlebars_assets (0.20.2)
execjs (~> 2.0)
multi_json (~> 1.0)
sprockets (~> 2.0)
sprockets (>= 2.0.0, < 4.0)
tilt (~> 1.2)
hashie (3.4.1)
hashie (3.4.2)
hike (1.2.3)
hiredis (0.5.2)
hitimes (1.2.2)
......@@ -371,13 +372,13 @@ GEM
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (2.2.0)
jasmine-core (2.3.4)
jasmine-jquery-rails (2.0.3)
jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
js-routes (1.0.1)
railties (>= 3.2)
......@@ -388,13 +389,13 @@ GEM
execjs
multi_json (>= 1.3)
rake
json (1.8.2)
jwt (1.4.1)
json (1.8.3)
jwt (1.5.0)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
listen (2.10.0)
listen (2.10.1)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
......@@ -418,7 +419,7 @@ GEM
messagebus_ruby_api (1.0.3)
method_source (0.8.2)
mime-types (2.6.1)
mini_magick (4.2.3)
mini_magick (4.2.7)
mini_portile (0.6.2)
minitest (5.7.0)
mobile-fu (1.3.1)
......@@ -470,7 +471,7 @@ GEM
faraday (~> 0.9.0)
nokogiri (~> 1.6)
orm_adapter (0.5.0)
parser (2.2.2.2)
parser (2.2.2.5)
ast (>= 1.1, < 3.0)
phantomjs (1.9.8.0)
powerpack (0.1.1)
......@@ -485,7 +486,7 @@ GEM
pry
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.2)
rack (1.6.4)
rack-cors (0.4.0)
rack-google-analytics (1.2.0)
actionpack
......@@ -503,16 +504,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
activemodel (= 4.2.2)
activerecord (= 4.2.2)
activesupport (= 4.2.2)
rails (4.2.3)
actionmailer (= 4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
activemodel (= 4.2.3)
activerecord (= 4.2.3)
activesupport (= 4.2.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.2)
railties (= 4.2.3)
sprockets-rails
rails-assets-diaspora_jsxc (0.1.1)
rails-assets-jquery (~> 1.11.1)
......@@ -520,11 +521,11 @@ GEM
rails-assets-jquery-fullscreen (~> 1.1.4)
rails-assets-jquery-ui (~> 1.10.4)
rails-assets-jquery.slimscroll (~> 1.3.3)
rails-assets-highlightjs (8.5.0)
rails-assets-highlightjs (8.6.0)
rails-assets-jakobmattsson--jquery-elastic (1.6.11)
rails-assets-jquery (>= 1.2.6)
rails-assets-jasmine (2.3.1)
rails-assets-jasmine-ajax (3.1.1)
rails-assets-jasmine (2.3.4)
rails-assets-jasmine-ajax (3.2.0)
rails-assets-jasmine (~> 2)
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
......@@ -532,8 +533,7 @@ GEM
rails-assets-jquery-colorbox (1.5.15)
rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen (1.1.4)
rails-assets-jquery-idletimer (1.0.1)
rails-assets-jquery-placeholder (2.1.1)
rails-assets-jquery-placeholder (2.1.2)
rails-assets-jquery (>= 1.6)
rails-assets-jquery-simulate (1.0.1)
rails-assets-jquery-simulate-ext (1.3.0)
......@@ -542,17 +542,16 @@ GEM
rails-assets-jquery
rails-assets-jquery-ui (1.10.4)
rails-assets-jquery (>= 1.6)
rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery.slimscroll (1.3.6)
rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
rails-assets-markdown-it (4.2.1)
rails-assets-markdown-it (4.4.0)
rails-assets-markdown-it-diaspora-mention (0.3.0)
rails-assets-markdown-it-hashtag (0.3.1)
rails-assets-markdown-it-sanitizer (0.3.1)
rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0)
rails-assets-perfect-scrollbar (0.5.9)
rails-assets-jquery (>= 1.10)
rails-assets-perfect-scrollbar (0.6.3)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
......@@ -567,7 +566,7 @@ GEM
rails-timeago (2.11.0)
actionpack (>= 3.1)
activesupport (>= 3.1)
rails_admin (0.6.7)
rails_admin (0.6.8)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
......@@ -581,18 +580,18 @@ GEM
remotipart (~> 1.0)
safe_yaml (~> 1.0)
sass-rails (>= 4.0, < 6)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
raindrops (0.13.0)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.2.3)
redcarpet (3.3.2)
redis (3.2.1)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
......@@ -603,32 +602,32 @@ GEM
roxml (3.1.6)
activesupport (>= 2.3.0)
nokogiri (>= 1.3.3)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.1)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
diff-lcs (>= 1.2.0, < 2.0)