[DRE-commits] [diaspora] 03/05: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Jun 28 17:11:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 5dceb5987c488d1830c29aaa8c1efde405daefa4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Jun 28 20:15:42 2016 +0530
refresh patches
---
debian/changelog | 1 +
.../002-remove-development-test-from-gemfile.patch | 6 +-
debian/patches/007-loosen-roxml-version.patch | 2 +-
debian/patches/030-loosen-tiny-versions.patch | 13 +-
debian/patches/031-embedded-gems.patch | 4 +-
debian/patches/033-relax-rails-minor-version.patch | 2 +-
debian/patches/050-relax-stable-libs.patch | 196 +++++++++++++++++----
.../patches/051-relax-patch-release-versions.patch | 166 +++++++++++++++--
8 files changed, 328 insertions(+), 62 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d965fff..99ae030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ diaspora (0.5.9.1+debian-1) UNRELEASED; urgency=medium
[ Pirate Praveen ]
* New upstream release
+ * Refresh patches
[ Rahulkrishnan R A ]
* Refresh patch
diff --git a/debian/patches/002-remove-development-test-from-gemfile.patch b/debian/patches/002-remove-development-test-from-gemfile.patch
index 881a001..7363025 100644
--- a/debian/patches/002-remove-development-test-from-gemfile.patch
+++ b/debian/patches/002-remove-development-test-from-gemfile.patch
@@ -2,7 +2,7 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -219,73 +219,3 @@ group :production do # we don"t install
+@@ -219,75 +219,3 @@ group :production do # we don"t install
gem "asset_sync", "1.1.0", require: false
end
@@ -34,6 +34,8 @@ Index: diaspora/Gemfile
-
- # test coverage
- gem "simplecov", "0.11.2", require: false
+-
+- gem "turbo_dev_assets", "0.0.2"
-end
-
-group :test do
@@ -57,7 +59,7 @@ Index: diaspora/Gemfile
- gem "webmock", "1.22.6", require: false
- gem "shoulda-matchers", "3.1.1"
-
-- gem "diaspora_federation-test", "0.0.12"
+- gem "diaspora_federation-test", "0.0.13"
-end
-
-group :development, :test do
diff --git a/debian/patches/007-loosen-roxml-version.patch b/debian/patches/007-loosen-roxml-version.patch
index a897664..136c461 100644
--- a/debian/patches/007-loosen-roxml-version.patch
+++ b/debian/patches/007-loosen-roxml-version.patch
@@ -3,7 +3,7 @@ Index: diaspora/Gemfile
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
@@ -129,7 +129,7 @@ gem "messagebus_ruby_api", "1.0.3"
- gem "nokogiri", "1.6.7.2"
+ gem "nokogiri", "1.6.8"
gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.3"
-gem "roxml", "3.1.6"
diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 5a185cd..22bd823 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -2,17 +2,8 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -55,7 +55,7 @@ gem "rack-cors", "0.4.0", require: "rack
-
- gem "bootstrap-sass", "2.3.2.2"
- gem "compass-rails", "2.0.5"
--gem "sass-rails", "5.0.4"
-+gem "sass-rails", "~> 5.0"
- gem "autoprefixer-rails", "6.3.1"
-
- # Database
-@@ -91,7 +91,7 @@ gem "js_image_paths", "0.0.2"
- gem "js-routes", "1.2.3"
+@@ -91,7 +91,7 @@ gem "js_image_paths", "0.1.0"
+ gem "js-routes", "1.2.4"
source "https://rails-assets.org" do
- gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index b65fed1..61f5f05 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -9,5 +9,5 @@ Index: diaspora/Gemfile
-gem "bootstrap-sass", "2.3.2.2"
+gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
gem "compass-rails", "2.0.5"
- gem "sass-rails", "~> 5.0"
- gem "autoprefixer-rails", "6.3.1"
+ gem "sass-rails", "5.0.4"
+ gem "autoprefixer-rails", "6.3.3.1"
diff --git a/debian/patches/033-relax-rails-minor-version.patch b/debian/patches/033-relax-rails-minor-version.patch
index 4638115..c1431c2 100644
--- a/debian/patches/033-relax-rails-minor-version.patch
+++ b/debian/patches/033-relax-rails-minor-version.patch
@@ -5,7 +5,7 @@ Index: diaspora/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
--gem "rails", "4.2.5.1"
+-gem "rails", "4.2.5.2"
+gem "rails", "~> 4.2.5"
# Legacy Rails features, remove me!
diff --git a/debian/patches/050-relax-stable-libs.patch b/debian/patches/050-relax-stable-libs.patch
index 7fe6952..748d248 100644
--- a/debian/patches/050-relax-stable-libs.patch
+++ b/debian/patches/050-relax-stable-libs.patch
@@ -18,45 +18,97 @@ Index: diaspora/Gemfile
# Federation
-@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.0.12
+@@ -17,8 +17,8 @@ gem "diaspora_federation-rails", "0.0.13
+ # API and JSON
gem "acts_as_api", "0.4.2"
- gem "json", "1.8.3"
+-gem "json", "1.8.3"
-gem "json-schema", "2.6.0"
++gem "json", "~> 1.8", ">= 1.8.3"
+gem "json-schema", "~> 2.6",
# Authentication
-@@ -56,7 +56,7 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require:
+ # Background processing
+
+ gem "sidekiq", "~> 4.0"
+-gem "sinatra", "1.4.7"
++gem "sinatra", "~> 1.4", ">= 1.4.7"
+
+ # Scheduled processing
+
+@@ -41,7 +41,7 @@ gem "sidekiq-cron", "~> 0.4.1"
+
+ # Compression
+
+-gem "uglifier", "2.7.2"
++gem "uglifier", "~> 2.7", ">= 2.7.2"
+
+ # Configuration
+
+@@ -54,9 +54,9 @@ gem "rack-cors", "0.4.0", require: "rack
+ # CSS
+
gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
- gem "compass-rails", "2.0.5"
- gem "sass-rails", "~> 5.0"
--gem "autoprefixer-rails", "6.3.1"
-+gem "autoprefixer-rails", "~> 6.3", ">= 6.3.1"
+-gem "compass-rails", "2.0.5"
+-gem "sass-rails", "5.0.4"
+-gem "autoprefixer-rails", "6.3.3.1"
++gem "compass-rails", "~> 2.0", ">= 2.0.5"
++gem "sass-rails", "~> 5.0", ">= 5.0.4"
++gem "autoprefixer-rails", "~> 6.3", ">= 6.3.3.1"
# Database
-@@ -70,8 +70,8 @@ gem "activerecord-import", "0.11.0"
+@@ -70,76 +70,76 @@ gem "activerecord-import", "0.11.0"
# File uploading
gem "carrierwave", "0.10.0"
-gem "fog", "1.37.0"
-gem "mini_magick", "4.4.0"
-+gem "fog", "~>1.34.0"
+-gem "remotipart", "1.2.1"
++gem "fog", "~> 1.34"
+gem "mini_magick", "~> 4.4"
- gem "remotipart", "1.2.1"
++gem "remotipart", "~> 1.2", ">= 1.2.1"
# GUID generation
-@@ -88,7 +88,7 @@ gem "handlebars_assets", "0.23.0"
- gem "jquery-rails", "4.1.0"
- gem "jquery-ui-rails", "5.0.5"
- gem "js_image_paths", "0.0.2"
--gem "js-routes", "1.2.3"
-+gem "js-routes", "~> 1.2"
+-gem "uuid", "2.3.8"
++gem "uuid", "~> 2.3", ">= 2.3.8"
+
+ # Icons
+
+-gem "entypo-rails", "2.2.3"
++gem "entypo-rails", "~> 2.2", ">= 2.2.3"
+
+ # JavaScript
+
+-gem "backbone-on-rails", "1.2.0.0"
++gem "backbone-on-rails", "~> 1.2"
+ gem "handlebars_assets", "0.23.0"
+-gem "jquery-rails", "4.1.0"
+-gem "jquery-ui-rails", "5.0.5"
++gem "jquery-rails", "~> 4.1"
++gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
+ gem "js_image_paths", "0.1.0"
+-gem "js-routes", "1.2.4"
++gem "js-routes", "~> 1.2", ">= 1.2.4"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
-@@ -105,7 +105,7 @@ source "https://rails-assets.org" do
+
+- gem "rails-assets-markdown-it", "6.0.0"
++ gem "rails-assets-markdown-it", "~> 6.0"
+ gem "rails-assets-markdown-it-hashtag", "0.4.0"
+ gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
+ gem "rails-assets-markdown-it-sanitizer", "0.4.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", "9.1.0"
++ gem "rails-assets-markdown-it-sub", "~> 1.0"
++ gem "rails-assets-markdown-it-sup", "~> 1.0"
++ gem "rails-assets-highlightjs", "~> 9.1"
+
# jQuery plugins
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
@@ -64,25 +116,36 @@ Index: diaspora/Gemfile
+ gem "rails-assets-jquery-placeholder", "~> 2.3", ">= 2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.10"
- gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
-@@ -117,7 +117,7 @@ gem "facebox-rails", "0.2.0"
+- gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
++ gem "rails-assets-jakobmattsson--jquery-elastic", "~> 1.6", ">= 1.6.11"
+ end
+
+ gem "facebox-rails", "0.2.0"
- gem "http_accept_language", "2.0.5"
- gem "i18n-inflector-rails", "1.0.7"
+ # Localization
+
+-gem "http_accept_language", "2.0.5"
+-gem "i18n-inflector-rails", "1.0.7"
-gem "rails-i18n", "4.0.8"
++gem "http_accept_language", "~> 2.0", ">= 2.0.5"
++gem "i18n-inflector-rails", "~> 1.0", ">= 1.0.7"
+gem "rails-i18n", "~> 4.0", ">= 4.0.8"
# Mail
-@@ -126,20 +126,20 @@ gem "messagebus_ruby_api", "1.0.3"
+-gem "markerb", "1.1.0"
+-gem "messagebus_ruby_api", "1.0.3"
++gem "markerb", "~> 1.1"
++gem "messagebus_ruby_api", "~> 1.0", ">= 1.0.3"
# Parsing
--gem "nokogiri", "1.6.7.2"
-+gem "nokogiri", "~> 1.6", ">= 1.6.7.2"
- gem "redcarpet", "3.3.4"
+-gem "nokogiri", "1.6.8"
+-gem "redcarpet", "3.3.4"
-gem "twitter-text", "1.13.3"
-+gem "twitter-text", "~> 1.13", ">=1.13.3"
++gem "nokogiri", "~> 1.6", ">= 1.6.8"
++gem "redcarpet", "~> 3.3", ">= 3.3.4"
++gem "twitter-text", "~> 1.13", ">= 1.13.3"
gem "roxml", "~> 3.1", ">= 3.1.6"
gem "ruby-oembed", "0.9.0"
gem "open_graph_reader", "0.6.1"
@@ -90,22 +153,85 @@ Index: diaspora/Gemfile
# Services
-gem "omniauth", "1.3.1"
-+gem "omniauth", "~> 1.3", ">= 1.3.1"
- gem "omniauth-facebook", "3.0.0"
+-gem "omniauth-facebook", "3.0.0"
-gem "omniauth-tumblr", "1.2"
-+gem "omniauth-tumblr", "~> 1.2"
- gem "omniauth-twitter", "1.2.1"
+-gem "omniauth-twitter", "1.2.1"
-gem "twitter", "5.16.0"
++gem "omniauth", "~> 1.3", ">= 1.3.1"
++gem "omniauth-facebook", "~> 3.0"
++gem "omniauth-tumblr", "~> 1.2"
++gem "omniauth-twitter", "~> 1.2", ">= 1.2.1"
+gem "twitter", "~> 5.16"
gem "omniauth-wordpress", "0.2.2"
# Serializers
-@@ -167,7 +167,7 @@ gem "typhoeus", "0.8.0"
- gem "gon", "6.0.1"
- gem "haml", "4.0.7"
- gem "mobile-fu", "1.3.1"
+@@ -152,23 +152,23 @@ gem "rails-assets-diaspora_jsxc", "~> 0.
+
+ # Tags
+
+-gem "acts-as-taggable-on", "3.5.0"
++gem "acts-as-taggable-on", "~> 3.5"
+
+ # URIs and HTTP
+
+-gem "addressable", "2.3.8", require: "addressable/uri"
++gem "addressable", "~> 2.3", ">= 2.3.8", require: "addressable/uri"
+ gem "faraday", "0.9.2"
+ gem "faraday_middleware", "0.10.0"
+ gem "faraday-cookie_jar", "0.0.6"
+-gem "typhoeus", "1.0.1"
++gem "typhoeus", "~> 1.0", ">= 1.0.1"
+
+ # Views
+
+-gem "gon", "6.0.1"
+-gem "haml", "4.0.7"
+-gem "mobile-fu", "1.3.1"
-gem "will_paginate", "3.1.0"
+-gem "rails-timeago", "~> 2.11.0"
++gem "gon", "~> 6.0", ">= 6.0.1"
++gem "haml", "~> 4.0", ">= 4.0.7"
++gem "mobile-fu", "~> 1.3", ">= 1.3.1"
+gem "will_paginate", "~> 3.1"
- gem "rails-timeago", "~> 2.11.0"
++gem "rails-timeago", "~> 2.11"
# Logging
+
+@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "
+
+ # Reading and writing zip files
+
+-gem "rubyzip", "1.1.7", require: "zip"
++gem "rubyzip", "~> 1.1", ">= 1.1.7", require: "zip"
+
+ # Prevent occasions where minitest is not bundled in
+ # packaged versions of ruby. See following issues/prs:
+@@ -199,12 +199,12 @@ group :production do # we don"t install
+
+ # Analytics
+
+- gem "rack-google-analytics", "1.2.0"
++ gem "rack-google-analytics", "~> 1.2"
+ gem "rack-piwik", "0.3.0", require: "rack/piwik"
+
+ # Click-jacking protection
+
+- gem "rack-protection", "1.5.3"
++ gem "rack-protection", "~> 1.5", ">= 1.5.3"
+
+ # Process management
+
+@@ -212,10 +212,10 @@ group :production do # we don"t install
+
+ # Redirects
+
+- gem "rack-rewrite", "1.5.1", require: false
+- gem "rack-ssl", "1.4.1", require: "rack/ssl"
++ gem "rack-rewrite", "~> 1.5", ">= 1.5.1", require: false
++ gem "rack-ssl", "~> 1.4", ">= 1.4.1", require: "rack/ssl"
+
+ # Third party asset hosting
+
+- gem "asset_sync", "1.1.0", require: false
++ gem "asset_sync", "~> 1.1", require: false
+ end
diff --git a/debian/patches/051-relax-patch-release-versions.patch b/debian/patches/051-relax-patch-release-versions.patch
index b31717a..f3bbf86 100644
--- a/debian/patches/051-relax-patch-release-versions.patch
+++ b/debian/patches/051-relax-patch-release-versions.patch
@@ -4,30 +4,176 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -22,7 +22,7 @@ gem "json-schema", "~> 2.6",
+@@ -16,19 +16,19 @@ gem "diaspora_federation-rails", "0.0.13
+
+ # API and JSON
+
+-gem "acts_as_api", "0.4.2"
++gem "acts_as_api", "~> 0.4.2"
+ gem "json", "~> 1.8", ">= 1.8.3"
+ gem "json-schema", "~> 2.6",
# Authentication
-gem "devise", "3.5.6"
+-gem "devise_lastseenable", "0.0.6"
+gem "devise", "~> 3.5.6"
- gem "devise_lastseenable", "0.0.6"
++gem "devise_lastseenable", "~> 0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0"
-@@ -33,7 +33,7 @@ gem "simple_captcha2", "0.4.0", require:
+ # Captcha
+
+-gem "simple_captcha2", "0.4.0", require: "simple_captcha"
++gem "simple_captcha2", "~> 0.4.0", require: "simple_captcha"
+
# Background processing
- gem "sidekiq", "~> 4.0"
--gem "sinatra", "1.4.7"
-+gem "sinatra", "~> 1.4.7"
+@@ -45,11 +45,11 @@ gem "uglifier", "~> 2.7", ">= 2.7.2"
+
+ # Configuration
- # Scheduled processing
+-gem "configurate", "0.3.1"
++gem "configurate", "~> 0.3.1"
+
+ # Cross-origin resource sharing
+
+-gem "rack-cors", "0.4.0", require: "rack/cors"
++gem "rack-cors", "~> 0.4.0", require: "rack/cors"
+
+ # CSS
+
+@@ -62,14 +62,14 @@ gem "autoprefixer-rails", "~> 6.3", ">=
-@@ -63,7 +63,7 @@ gem "autoprefixer-rails", "~> 6.3", ">=
ENV["DB"] ||= "mysql"
- gem "mysql2", "0.4.2" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+-gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
++gem "mysql2", "~> 0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg", "~> 0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
- gem "activerecord-import", "0.11.0"
+-gem "activerecord-import", "0.11.0"
++gem "activerecord-import", "~> 0.11.0"
+
+ # File uploading
+
+-gem "carrierwave", "0.10.0"
++gem "carrierwave", "~> 0.10.0"
+ gem "fog", "~> 1.34"
+ gem "mini_magick", "~> 4.4"
+ gem "remotipart", "~> 1.2", ">= 1.2.1"
+@@ -84,34 +84,34 @@ gem "entypo-rails", "~> 2.2", ">= 2.2.3"
+ # JavaScript
+
+ gem "backbone-on-rails", "~> 1.2"
+-gem "handlebars_assets", "0.23.0"
++gem "handlebars_assets", "~> 0.23.0"
+ gem "jquery-rails", "~> 4.1"
+ gem "jquery-ui-rails", "~> 5.0", ">= 5.0.5"
+-gem "js_image_paths", "0.1.0"
++gem "js_image_paths", "~> 0.1.0"
+ gem "js-routes", "~> 1.2", ">= 1.2.4"
+
+ source "https://rails-assets.org" do
+ gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
+
+ gem "rails-assets-markdown-it", "~> 6.0"
+- gem "rails-assets-markdown-it-hashtag", "0.4.0"
+- gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
+- gem "rails-assets-markdown-it-sanitizer", "0.4.1"
+- gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
++ gem "rails-assets-markdown-it-hashtag", "~> 0.4.0"
++ gem "rails-assets-markdown-it-diaspora-mention", "~> 0.4.0"
++ gem "rails-assets-markdown-it-sanitizer", "~> 0.4.1"
++ gem "rails-assets-markdown-it--markdown-it-for-inline", "~> 0.1.1"
+ gem "rails-assets-markdown-it-sub", "~> 1.0"
+ gem "rails-assets-markdown-it-sup", "~> 1.0"
+ gem "rails-assets-highlightjs", "~> 9.1"
+
+ # jQuery plugins
+
+- gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
++ gem "rails-assets-jeresig--jquery.hotkeys", "~> 0.2.0"
+ gem "rails-assets-jquery-placeholder", "~> 2.3", ">= 2.3.1"
+- gem "rails-assets-jquery-textchange", "0.2.3"
+- gem "rails-assets-perfect-scrollbar", "0.6.10"
++ gem "rails-assets-jquery-textchange", "~> 0.2.3"
++ gem "rails-assets-perfect-scrollbar", "~> 0.6.10"
+ gem "rails-assets-jakobmattsson--jquery-elastic", "~> 1.6", ">= 1.6.11"
+ end
+
+-gem "facebox-rails", "0.2.0"
++gem "facebox-rails", "~> 0.2.0"
+
+ # Localization
+
+@@ -130,8 +130,8 @@ gem "nokogiri", "~> 1.6", ">= 1
+ gem "redcarpet", "~> 3.3", ">= 3.3.4"
+ gem "twitter-text", "~> 1.13", ">= 1.13.3"
+ gem "roxml", "~> 3.1", ">= 3.1.6"
+-gem "ruby-oembed", "0.9.0"
+-gem "open_graph_reader", "0.6.1"
++gem "ruby-oembed", "~> 0.9.0"
++gem "open_graph_reader", "~> 0.6.1"
+
+ # Services
+
+@@ -140,11 +140,11 @@ gem "omniauth-facebook", "~> 3.0"
+ gem "omniauth-tumblr", "~> 1.2"
+ gem "omniauth-twitter", "~> 1.2", ">= 1.2.1"
+ gem "twitter", "~> 5.16"
+-gem "omniauth-wordpress", "0.2.2"
++gem "omniauth-wordpress", "~> 0.2.2"
+
+ # Serializers
+
+-gem "active_model_serializers", "0.9.4"
++gem "active_model_serializers", "~> 0.9.4"
+
+ # XMPP chat dependencies
+ gem "diaspora-vines", "~> 0.2.0.develop"
+@@ -157,9 +157,9 @@ gem "acts-as-taggable-on", "~> 3.5"
+ # URIs and HTTP
+
+ gem "addressable", "~> 2.3", ">= 2.3.8", require: "addressable/uri"
+-gem "faraday", "0.9.2"
+-gem "faraday_middleware", "0.10.0"
+-gem "faraday-cookie_jar", "0.0.6"
++gem "faraday", "~> 0.9.2"
++gem "faraday_middleware", "~> 0.10.0"
++gem "faraday-cookie_jar", "~> 0.0.6"
+ gem "typhoeus", "~> 1.0", ">= 1.0.1"
+
+ # Views
+@@ -172,7 +172,7 @@ gem "rails-timeago", "~> 2.11"
+
+ # Logging
+
+-gem "logging-rails", "0.5.0", require: "logging/rails"
++gem "logging-rails", "~> 0.5.0", require: "logging/rails"
+
+ # Reading and writing zip files
+
+@@ -195,12 +195,12 @@ gem "minitest"
+ group :production do # we don"t install these on travis to speed up test runs
+ # Administration
+
+- gem "rails_admin", "0.8.1"
++ gem "rails_admin", "~> 0.8.1"
+
+ # Analytics
+
+ gem "rack-google-analytics", "~> 1.2"
+- gem "rack-piwik", "0.3.0", require: "rack/piwik"
++ gem "rack-piwik", "~> 0.3.0", require: "rack/piwik"
+
+ # Click-jacking protection
+
+@@ -208,7 +208,7 @@ group :production do # we don"t install
+
+ # Process management
+
+- gem "eye", "0.7"
++ gem "eye", "~> 0.7.0"
+
+ # Redirects
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git
More information about the Pkg-ruby-extras-commits
mailing list