Merge branch 'release/0.7.5.0' (42ceb8b3) · Commits · Gigadoc 2 / diaspora

.eslintrc

+3 −2

Original line number	Diff line number	Diff line
		@@ -10,16 +10,17 @@
		"autosize": false,
		"Backbone": false,
		"Bloodhound": false,
		"blueimp": false,
		"gon": false,
		"Handlebars": false,
		"HandlebarsTemplates": false,
		"ImagePaths": false,
		"jsxc": false,
		"L": false,
		"Routes": false,
		"OSM": false,
		"PerfectScrollbar": false,
		"qq": false,
		"blueimp": false,
		"Routes": false,

		"loginAs": true,
		"logout": true,

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ vendor/bundle/
		vendor/cache/
		config/database.yml
		config/oidc_key.pem
		config/schedule.yml

		# Generated files
		log/
		@@ -50,6 +51,7 @@ public/source.tar*
		tmp/

		# Temporary files of every sort
		.byebug_history
		.sass-cache/
		.DS_Store
		.idea

Changelog.md

+19 −0

Original line number	Diff line number	Diff line
		# 0.7.5.0

		## Refactor
		* Remove the 'make contacts in this aspect visible to each other' option [#7769](https://github.com/diaspora/diaspora/pull/7769)
		* Remove the requirement to have at least two users to disable the /podmin redirect [#7783](https://github.com/diaspora/diaspora/pull/7783)
		* Randomize start times of daily Sidekiq-Cron jobs [#7787](https://github.com/diaspora/diaspora/pull/7787)

		## Bug fixes
		* Prefill conversation form on contacts page only with mutual contacts [#7744](https://github.com/diaspora/diaspora/pull/7744)
		* Fix profiles sometimes not loading properly in background tabs [#7740](https://github.com/diaspora/diaspora/pull/7740)
		* Show error message when creating posts with invalid aspects [#7742](https://github.com/diaspora/diaspora/pull/7742)
		* Fix mention syntax backport for two immediately consecutive mentions [#7777](https://github.com/diaspora/diaspora/pull/7777)
		* Fix link to 'make yourself an admin' [#7783](https://github.com/diaspora/diaspora/pull/7783)
		* Fix calculation of content lengths when cross-posting to twitter [#7791](https://github.com/diaspora/diaspora/pull/7791)

		## Features
		* Make public stream accessible for logged out users [#7775](https://github.com/diaspora/diaspora/pull/7775)
		* Add account-merging support when receiving an account migration [#7803](https://github.com/diaspora/diaspora/pull/7803)

		# 0.7.4.1

		Fixes a possible cross-site scripting issue with maliciously crafted OpenGraph metadata.

Gemfile

+45 −44

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@

		source "https://rubygems.org"

		gem "rails", "5.1.4"
		gem "rails", "5.1.6"

		# Legacy Rails features, remove me!
		# responders (class level)
		@@ -10,7 +10,7 @@ gem "responders", "2.4.0"

		# Appserver

		gem "unicorn", "5.3.0", require: false
		gem "unicorn", "5.4.0", require: false
		gem "unicorn-worker-killer", "0.4.4"

		# Federation
		@@ -26,7 +26,7 @@ gem "json-schema", "2.8.0"

		# Authentication

		gem "devise", "4.4.1"
		gem "devise", "4.4.3"
		gem "devise_lastseenable", "0.0.6"

		# Captcha
		@@ -35,7 +35,8 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha"

		# Background processing

		gem "sidekiq", "5.0.4"
		gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
		gem "sidekiq", "5.1.3"

		# Scheduled processing

		@@ -43,7 +44,7 @@ gem "sidekiq-cron", "0.6.3"

		# Compression

		gem "uglifier", "3.2.0"
		gem "uglifier", "4.1.8"

		# Configuration

		@@ -51,33 +52,33 @@ gem "configurate", "0.3.1"

		# Cross-origin resource sharing

		gem "rack-cors", "1.0.1", require: "rack/cors"
		gem "rack-cors", "1.0.2", require: "rack/cors"

		# CSS

		gem "autoprefixer-rails", "7.1.4.1"
		gem "autoprefixer-rails", "8.2.0"
		gem "bootstrap-sass", "3.3.7"
		gem "bootstrap-switch-rails", "3.3.3"
		gem "compass-rails", "3.0.2"
		gem "sass-rails", "5.0.6"
		gem "sass-rails", "5.0.7"
		gem "sprockets-rails", "3.2.1"

		# Database

		group :mysql, optional: true do
		gem "mysql2", "0.4.9"
		gem "mysql2", "0.5.0"
		end
		group :postgresql, optional: true do
		gem "pg", "0.21.0"
		gem "pg", "1.0.0"
		end


		gem "activerecord-import", "0.20.1"
		gem "activerecord-import", "0.22.0"

		# File uploading

		gem "carrierwave", "1.1.0"
		gem "fog-aws", "1.4.1"
		gem "carrierwave", "1.2.2"
		gem "fog-aws", "2.0.1"
		gem "mini_magick", "4.8.0"

		# GUID generation
		@@ -91,7 +92,7 @@ gem "entypo-rails", "3.0.0"

		gem "handlebars_assets", "0.23.2"
		gem "jquery-rails", "4.3.1"
		gem "js-routes", "1.4.1"
		gem "js-routes", "1.4.3"
		gem "js_image_paths", "0.1.1"

		source "https://rails-assets.org" do
		@@ -99,7 +100,7 @@ source "https://rails-assets.org" do
		gem "rails-assets-jquery.ui", "1.11.4"

		gem "rails-assets-highlightjs", "9.12.0"
		gem "rails-assets-markdown-it", "8.4.0"
		gem "rails-assets-markdown-it", "8.4.1"
		gem "rails-assets-markdown-it-hashtag", "0.4.0"
		gem "rails-assets-markdown-it-diaspora-mention", "1.2.0"
		gem "rails-assets-markdown-it-sanitizer", "0.4.3"
		@@ -109,17 +110,17 @@ source "https://rails-assets.org" do

		gem "rails-assets-backbone", "1.3.3"
		gem "rails-assets-bootstrap-markdown", "2.10.0"
		gem "rails-assets-corejs-typeahead", "1.1.1"
		gem "rails-assets-corejs-typeahead", "1.2.1"
		gem "rails-assets-fine-uploader", "5.13.0"

		# jQuery plugins

		gem "rails-assets-autosize", "4.0.0"
		gem "rails-assets-blueimp-gallery", "2.27.0"
		gem "rails-assets-autosize", "4.0.1"
		gem "rails-assets-blueimp-gallery", "2.33.0"
		gem "rails-assets-jquery.are-you-sure", "1.9.0"
		gem "rails-assets-jquery-placeholder", "2.3.1"
		gem "rails-assets-jquery-textchange", "0.2.3"
		gem "rails-assets-perfect-scrollbar", "0.6.16"
		gem "rails-assets-utatti-perfect-scrollbar", "1.3.0"
		end

		gem "markdown-it-html5-embed", "1.0.0"
		@@ -135,7 +136,7 @@ gem "rails-i18n", "5.1.1"
		gem "markerb", "1.1.0"

		# Map
		gem "leaflet-rails", "1.2.0"
		gem "leaflet-rails", "1.3.1"

		# Parsing

		@@ -147,23 +148,23 @@ gem "twitter-text", "1.14.7"

		# RTL support

		gem "string-direction", "1.2.0"
		gem "string-direction", "1.2.1"

		# Security Headers

		gem "secure_headers", "3.7.1"
		gem "secure_headers", "5.0.5"

		# Services

		gem "omniauth", "1.6.1"
		gem "omniauth", "1.8.1"
		gem "omniauth-facebook", "4.0.0"
		gem "omniauth-tumblr", "1.2"
		gem "omniauth-twitter", "1.4.0"
		gem "twitter", "6.1.0"
		gem "omniauth-wordpress", "0.2.2"
		gem "twitter", "6.2.0"

		# OpenID Connect
		gem "openid_connect", "1.1.3"
		gem "openid_connect", "1.1.5"

		# Serializers

		@@ -180,15 +181,15 @@ gem "acts-as-taggable-on", "5.0.0"
		# URIs and HTTP

		gem "addressable", "2.5.2", require: "addressable/uri"
		gem "faraday", "0.11.0" # also update User-Agent in OpenID specs
		gem "faraday", "0.12.2" # also update User-Agent in OpenID specs
		gem "faraday_middleware", "0.12.2"
		gem "faraday-cookie_jar", "0.0.6"
		gem "typhoeus", "1.3.0"

		# Views

		gem "gon", "6.1.0"
		gem "hamlit", "2.8.6"
		gem "gon", "6.2.0"
		gem "hamlit", "2.8.8"
		gem "mobile-fu", "1.4.0"
		gem "rails-timeago", "2.16.0"
		gem "will_paginate", "3.1.6"
		@@ -208,7 +209,7 @@ gem "rubyzip", "1.2.1", require: "zip"
		# https://github.com/discourse/discourse/pull/238
		gem "minitest"

		gem "versionist", "1.6.0"
		gem "versionist", "1.7.0"

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

		# Process management

		gem "eye", "0.9.2"
		gem "eye", "0.10.0"

		# Redirects

		@@ -234,26 +235,26 @@ group :production do # we don"t install these on travis to speed up test runs

		# Third party asset hosting

		gem "asset_sync", "2.2.0", require: false
		gem "asset_sync", "2.4.0", require: false
		end

		group :development do
		# Automatic test runs
		gem "guard", "2.14.1", require: false
		gem "guard", "2.14.2", require: false
		gem "guard-cucumber", "2.1.2", require: false
		gem "guard-rspec", "4.7.3", require: false
		gem "guard-rubocop", "1.3.0", require: false
		gem "rb-fsevent", "0.10.2", require: false
		gem "rb-fsevent", "0.10.3", require: false
		gem "rb-inotify", "0.9.10", require: false

		# Linters
		gem "haml_lint", "0.26.0", require: false
		gem "haml_lint", "0.27.0", require: false
		gem "pronto", "0.9.5", require: false
		gem "pronto-eslint", "0.9.1", require: false
		gem "pronto-haml", "0.9.0", require: false
		gem "pronto-rubocop", "0.9.0", require: false
		gem "pronto-scss", "0.9.1", require: false
		gem "rubocop", "0.50.0", require: false
		gem "rubocop", "0.54.0", require: false

		# Preloading environment

		@@ -274,25 +275,25 @@ end
		group :test do
		# RSpec (unit tests, some integration tests)

		gem "fixture_builder", "0.5.0"
		gem "fuubar", "2.2.0"
		gem "fixture_builder", "0.5.1"
		gem "fuubar", "2.3.1"
		gem "json-schema-rspec", "0.0.4"
		gem "rspec-json_expectations", "~> 2.1"

		# Cucumber (integration tests)

		gem "capybara", "2.15.1"
		gem "database_cleaner", "1.6.1"
		gem "poltergeist", "1.16.0"
		gem "capybara", "2.18.0"
		gem "database_cleaner", "1.6.2"
		gem "poltergeist", "1.17.0"

		gem "cucumber-api-steps", "0.13", require: false
		gem "cucumber-api-steps", "0.14", require: false

		# General helpers

		gem "factory_girl_rails", "4.8.0"
		gem "shoulda-matchers", "3.1.2"
		gem "timecop", "0.9.1"
		gem "webmock", "3.0.1", require: false
		gem "webmock", "3.3.0", require: false

		gem "diaspora_federation-test", "0.2.4"

		@@ -302,13 +303,13 @@ end

		group :development, :test do
		# RSpec (unit tests, some integration tests)
		gem "rspec-rails", "3.6.1"
		gem "rspec-rails", "3.7.2"

		# Cucumber (integration tests)
		gem "cucumber-rails", "1.5.0", require: false

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

Gemfile.lock

+226 −227

File changed.

Preview size limit exceeded, changes collapsed.