[DRE-commits] [diaspora] 234/257: refresh patch

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 01a1fefeb0409e4ee5f15fa14504d294245e394f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 1 17:56:25 2015 +0530

    refresh patch
---
 debian/patches/018-loosen-rails-timeago.patch | 119 ++------------------------
 1 file changed, 9 insertions(+), 110 deletions(-)

diff --git a/debian/patches/018-loosen-rails-timeago.patch b/debian/patches/018-loosen-rails-timeago.patch
index d8bf628..991e02c 100644
--- a/debian/patches/018-loosen-rails-timeago.patch
+++ b/debian/patches/018-loosen-rails-timeago.patch
@@ -2,113 +2,12 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require:
- 
- # Background processing
- 
--gem "sidekiq", "3.2.6"
-+gem "sidekiq", "3.3.3"
- gem "sinatra", "1.4.6"
- 
- # Scheduled processing
-@@ -53,7 +53,7 @@ gem "rack-cors", "0.3.1", require: "rack
- 
- # CSS
- 
--gem "bootstrap-sass", "~>2.3"
-+gem "bootstrap-sass", "2.3.2.2"
- gem "compass-rails",  "2.0.4"
- gem "sass-rails",     "5.0.1"
- gem "autoprefixer-rails", "5.1.7.1"
-@@ -118,14 +118,14 @@ gem "rails-i18n",           "4.0.4"
- # Mail
- 
- gem "markerb",             "1.0.2"
--gem "messagebus_ruby_api", ">=1.0.3"
-+gem "messagebus_ruby_api", "1.0.3"
- 
- # Parsing
- 
- gem "nokogiri",          "1.6.6.2"
- gem "redcarpet",         "3.2.2"
- gem "twitter-text",      "1.11.0"
--gem "roxml",             ">=3.1.6"
-+gem "roxml",             "3.1.6"
- gem "ruby-oembed",       "0.8.12"
- gem "open_graph_reader", "0.5.0"
- 
-@@ -135,7 +135,7 @@ gem "omniauth",           "1.2.2"
- gem "omniauth-facebook",  "1.6.0"
- gem "omniauth-tumblr",    "1.1"
- gem "omniauth-twitter",   "1.0.1"
--gem "twitter",            ">=4.8.1"
-+gem "twitter",            "4.8.1"
- gem "omniauth-wordpress", "0.2.1"
- 
- # Serializers
-@@ -211,3 +211,65 @@ group :production do # we don"t install
- 
-   gem "asset_sync", "1.1.0", require: false
- end
-+
-+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-rubocop",  "1.2.0"
-+  gem "guard",          "2.12.5", require: false
-+  gem "rb-fsevent",     "0.9.4", require: false
-+  gem "rb-inotify",     "0.9.5", require: false
-+
-+  # Linters
-+  gem "jshintrb", "0.3.0"
-+  gem "rubocop",  "0.29.1"
-+
-+  # Preloading environment
-+
-+  gem "spring", "1.3.3"
-+  gem "spring-commands-rspec", "1.0.4"
-+  gem "spring-commands-cucumber", "1.0.1"
-+
-+  # Debugging
-+  gem "pry"
-+  gem "pry-debundle"
-+  gem "pry-byebug"
-+end
-+
-+group :test do
-+  # RSpec (unit tests, some integration tests)
-+
-+  gem "fixture_builder",   "0.3.6"
-+  gem "fuubar",            "2.0.0"
-+  gem "rspec-instafail",   "0.2.6", require: false
-+  gem "test_after_commit", "0.4.1"
-+
-+  # Cucumber (integration tests)
-+
-+  gem "capybara",           "2.4.4"
-+  gem "database_cleaner" ,  "1.4.1"
-+  gem "selenium-webdriver", "2.45.0"
-+
-+  # General helpers
-+
-+  gem "factory_girl_rails", "4.5.0"
-+  gem "timecop",            "0.7.3"
-+  gem "webmock",            "1.20.4", 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"
-+
-+  # Cucumber (integration tests)
-+  gem "cucumber-rails",     "1.4.2", require: false
-+
-+  # 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.0", source: "https://rails-assets.org"
-+  gem "sinon-rails",               "1.10.3"
-+end
+@@ -164,7 +164,7 @@ gem "gon",                     "5.2.3"
+ gem "haml",                    "4.0.6"
+ gem "mobile-fu",               "1.3.1"
+ gem "will_paginate",           "3.0.7"
+-gem "rails-timeago",           "2.11.0"
++gem "rails-timeago",           "~>2.11"
+ 
+ # Workarounds
+ # https://github.com/rubyzip/rubyzip#important-note

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git