[DRE-commits] [diaspora] 229/257: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Sun Apr 12 14:17:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository diaspora.
commit 8e4c317089db1a8bb375c393e6332fa0e49fc66e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Mar 31 22:45:14 2015 +0530
refresh patches
---
debian/patches/003-remove-gemfile-lock.patch | 826 --------------------------
debian/patches/018-loosen-rails-timeago.patch | 119 +++-
2 files changed, 110 insertions(+), 835 deletions(-)
diff --git a/debian/patches/003-remove-gemfile-lock.patch b/debian/patches/003-remove-gemfile-lock.patch
index 6cba24a..e69de29 100644
--- a/debian/patches/003-remove-gemfile-lock.patch
+++ b/debian/patches/003-remove-gemfile-lock.patch
@@ -1,826 +0,0 @@
-Index: diaspora/Gemfile.lock
-===================================================================
---- diaspora.orig/Gemfile.lock
-+++ /dev/null
-@@ -1,821 +0,0 @@
--GEM
-- remote: https://rubygems.org/
-- remote: https://rails-assets.org/
-- specs:
-- CFPropertyList (2.3.1)
-- actionmailer (4.2.1)
-- actionpack (= 4.2.1)
-- actionview (= 4.2.1)
-- activejob (= 4.2.1)
-- mail (~> 2.5, >= 2.5.4)
-- rails-dom-testing (~> 1.0, >= 1.0.5)
-- actionpack (4.2.1)
-- actionview (= 4.2.1)
-- activesupport (= 4.2.1)
-- 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.1)
-- activesupport (= 4.2.1)
-- builder (~> 3.1)
-- erubis (~> 2.7.0)
-- rails-dom-testing (~> 1.0, >= 1.0.5)
-- rails-html-sanitizer (~> 1.0, >= 1.0.1)
-- active_model_serializers (0.9.3)
-- activemodel (>= 3.2)
-- activejob (4.2.1)
-- activesupport (= 4.2.1)
-- globalid (>= 0.3.0)
-- activemodel (4.2.1)
-- activesupport (= 4.2.1)
-- builder (~> 3.1)
-- activerecord (4.2.1)
-- activemodel (= 4.2.1)
-- activesupport (= 4.2.1)
-- arel (~> 6.0)
-- activerecord-import (0.7.0)
-- activerecord (>= 3.0)
-- activeresource (4.0.0)
-- activemodel (~> 4.0)
-- activesupport (~> 4.0)
-- rails-observers (~> 0.1.1)
-- activesupport (4.2.1)
-- i18n (~> 0.7)
-- json (~> 1.7, >= 1.7.7)
-- minitest (~> 5.1)
-- thread_safe (~> 0.3, >= 0.3.4)
-- tzinfo (~> 1.1)
-- acts-as-taggable-on (3.5.0)
-- activerecord (>= 3.2, < 5)
-- acts_as_api (0.4.2)
-- activemodel (>= 3.0.0)
-- activesupport (>= 3.0.0)
-- rack (>= 1.1.0)
-- addressable (2.3.7)
-- arel (6.0.0)
-- asset_sync (1.1.0)
-- activemodel
-- fog (>= 1.8.0)
-- unf
-- ast (2.0.0)
-- astrolabe (1.3.0)
-- parser (>= 2.2.0.pre.3, < 3.0)
-- autoprefixer-rails (5.1.7.1)
-- execjs
-- json
-- backbone-on-rails (1.1.2.0)
-- actionmailer
-- actionpack
-- activemodel
-- activeresource
-- eco
-- ejs
-- jquery-rails
-- railties
-- bcrypt (3.1.10)
-- bootstrap-sass (2.3.2.2)
-- sass (~> 3.2)
-- builder (3.2.2)
-- byebug (4.0.3)
-- columnize (= 0.9.0)
-- capybara (2.4.4)
-- mime-types (>= 1.16)
-- nokogiri (>= 1.3.3)
-- rack (>= 1.0.0)
-- rack-test (>= 0.5.4)
-- xpath (~> 2.0)
-- carrierwave (0.10.0)
-- activemodel (>= 3.2.0)
-- activesupport (>= 3.2.0)
-- json (>= 1.7)
-- mime-types (>= 1.16)
-- celluloid (0.16.0)
-- timers (~> 4.0.0)
-- childprocess (0.5.5)
-- ffi (~> 1.0, >= 1.0.11)
-- chunky_png (1.3.4)
-- coderay (1.1.0)
-- coffee-rails (4.1.0)
-- coffee-script (>= 2.2.0)
-- railties (>= 4.0.0, < 5.0)
-- coffee-script (2.3.0)
-- coffee-script-source
-- execjs
-- coffee-script-source (1.9.1)
-- columnize (0.9.0)
-- compass (1.0.3)
-- chunky_png (~> 1.2)
-- compass-core (~> 1.0.2)
-- compass-import-once (~> 1.0.5)
-- rb-fsevent (>= 0.9.3)
-- rb-inotify (>= 0.9)
-- sass (>= 3.3.13, < 3.5)
-- compass-core (1.0.3)
-- multi_json (~> 1.0)
-- sass (>= 3.3.0, < 3.5)
-- compass-import-once (1.0.5)
-- sass (>= 3.2, < 3.5)
-- compass-rails (2.0.4)
-- compass (~> 1.0.0)
-- sass-rails (<= 5.0.1)
-- sprockets (< 2.13)
-- configurate (0.2.0)
-- connection_pool (2.1.3)
-- crack (0.4.2)
-- safe_yaml (~> 1.0.0)
-- cucumber (1.3.19)
-- builder (>= 2.1.2)
-- diff-lcs (>= 1.1.3)
-- gherkin (~> 2.12)
-- multi_json (>= 1.7.5, < 2.0)
-- multi_test (>= 0.1.2)
-- cucumber-rails (1.4.2)
-- capybara (>= 1.1.2, < 3)
-- cucumber (>= 1.3.8, < 2)
-- mime-types (>= 1.16, < 3)
-- nokogiri (~> 1.5)
-- rails (>= 3, < 5)
-- database_cleaner (1.4.1)
-- devise (3.4.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_lastseenable (0.0.4)
-- devise
-- devise
-- rails (>= 3.0.4)
-- rails (>= 3.0.4)
-- warden
-- warden
-- diaspora-vines (0.1.27)
-- activerecord (~> 4.1)
-- bcrypt (~> 3.1)
-- em-hiredis (~> 0.3.0)
-- eventmachine (>= 1.0.5, < 1.1)
-- http_parser.rb (~> 0.6)
-- nokogiri (~> 1.6)
-- diff-lcs (1.2.5)
-- domain_name (0.5.23)
-- unf (>= 0.0.5, < 1.0.0)
-- eco (1.0.0)
-- coffee-script
-- eco-source
-- execjs
-- eco-source (1.1.0.rc.1)
-- ejs (1.1.1)
-- em-hiredis (0.3.0)
-- eventmachine (~> 1.0)
-- hiredis (~> 0.5.0)
-- entypo-rails (2.2.2)
-- railties (>= 3.1, <= 5)
-- erubis (2.7.0)
-- ethon (0.7.3)
-- ffi (>= 1.3.0)
-- eventmachine (1.0.7)
-- excon (0.44.4)
-- execjs (2.4.0)
-- factory_girl (4.5.0)
-- activesupport (>= 3.0.0)
-- factory_girl_rails (4.5.0)
-- factory_girl (~> 4.5.0)
-- railties (>= 3.0.0)
-- faraday (0.9.1)
-- multipart-post (>= 1.2, < 3)
-- faraday-cookie_jar (0.0.6)
-- faraday (>= 0.7.4)
-- http-cookie (~> 1.0.0)
-- faraday_middleware (0.9.1)
-- faraday (>= 0.7.4, < 0.10)
-- ffi (1.9.8)
-- fission (0.5.0)
-- CFPropertyList (~> 2.2)
-- fixture_builder (0.3.6)
-- activerecord (>= 2)
-- activesupport (>= 2)
-- fog (1.28.0)
-- fog-atmos
-- fog-aws (~> 0.0)
-- fog-brightbox (~> 0.4)
-- fog-core (~> 1.27, >= 1.27.3)
-- fog-ecloud
-- fog-json
-- fog-profitbricks
-- fog-radosgw (>= 0.0.2)
-- fog-riakcs
-- fog-sakuracloud (>= 0.0.4)
-- fog-serverlove
-- fog-softlayer
-- fog-storm_on_demand
-- fog-terremark
-- fog-vmfusion
-- fog-voxel
-- fog-xml (~> 0.1.1)
-- ipaddress (~> 0.5)
-- nokogiri (~> 1.5, >= 1.5.11)
-- fog-atmos (0.1.0)
-- fog-core
-- fog-xml
-- fog-aws (0.1.1)
-- fog-core (~> 1.27)
-- fog-json (~> 1.0)
-- fog-xml (~> 0.1)
-- ipaddress (~> 0.8)
-- fog-brightbox (0.7.1)
-- fog-core (~> 1.22)
-- fog-json
-- inflecto (~> 0.0.2)
-- fog-core (1.29.0)
-- builder
-- excon (~> 0.38)
-- formatador (~> 0.2)
-- mime-types
-- net-scp (~> 1.1)
-- net-ssh (>= 2.1.3)
-- fog-ecloud (0.0.2)
-- fog-core
-- fog-xml
-- fog-json (1.0.0)
-- multi_json (~> 1.0)
-- fog-profitbricks (0.0.2)
-- fog-core
-- fog-xml
-- nokogiri
-- fog-radosgw (0.0.3)
-- fog-core (>= 1.21.0)
-- fog-json
-- fog-xml (>= 0.0.1)
-- fog-riakcs (0.1.0)
-- fog-core
-- fog-json
-- fog-xml
-- fog-sakuracloud (1.0.0)
-- fog-core
-- fog-json
-- fog-serverlove (0.1.1)
-- fog-core
-- fog-json
-- fog-softlayer (0.4.1)
-- fog-core
-- fog-json
-- fog-storm_on_demand (0.1.0)
-- fog-core
-- fog-json
-- fog-terremark (0.0.4)
-- fog-core
-- fog-xml
-- fog-vmfusion (0.0.1)
-- fission
-- fog-core
-- fog-voxel (0.0.2)
-- fog-core
-- fog-xml
-- fog-xml (0.1.1)
-- fog-core
-- nokogiri (~> 1.5, >= 1.5.11)
-- font-awesome-rails (4.3.0.0)
-- railties (>= 3.2, < 5.0)
-- foreman (0.62.0)
-- thor (>= 0.13.6)
-- formatador (0.2.5)
-- fuubar (2.0.0)
-- rspec (~> 3.0)
-- ruby-progressbar (~> 1.4)
-- gherkin (2.12.2)
-- multi_json (~> 1.3)
-- globalid (0.3.3)
-- activesupport (>= 4.1.0)
-- gon (5.2.3)
-- actionpack (>= 2.3.0)
-- json
-- multi_json
-- request_store (>= 1.0.5)
-- guard (2.12.5)
-- formatador (>= 0.2.4)
-- listen (~> 2.7)
-- lumberjack (~> 1.0)
-- nenv (~> 0.1)
-- notiffany (~> 0.0)
-- pry (>= 0.9.12)
-- shellany (~> 0.0)
-- thor (>= 0.18.1)
-- guard-compat (1.2.1)
-- guard-cucumber (1.5.4)
-- cucumber (>= 1.3.0)
-- guard-compat (~> 1.0)
-- nenv (~> 0.1)
-- guard-jshintrb (1.1.1)
-- guard (~> 2.0)
-- jshintrb
-- guard-rspec (4.5.0)
-- guard (~> 2.1)
-- guard-compat (~> 1.1)
-- rspec (>= 2.99.0, < 4.0)
-- guard-rubocop (1.2.0)
-- guard (~> 2.0)
-- rubocop (~> 0.20)
-- haml (4.0.6)
-- tilt
-- handlebars_assets (0.20.1)
-- execjs (~> 2.0)
-- multi_json (~> 1.0)
-- sprockets (~> 2.0)
-- tilt (~> 1.2)
-- hashie (3.4.0)
-- hike (1.2.3)
-- hiredis (0.5.2)
-- hitimes (1.2.2)
-- http-cookie (1.0.2)
-- domain_name (~> 0.5)
-- http_accept_language (2.0.5)
-- http_parser.rb (0.6.0)
-- i18n (0.7.0)
-- i18n-inflector (2.6.7)
-- i18n (>= 0.4.1)
-- i18n-inflector-rails (1.0.7)
-- actionpack (>= 3.0.0)
-- i18n-inflector (~> 2.6)
-- railties (>= 3.0.0)
-- ice_cube (0.11.1)
-- inflecto (0.0.2)
-- ipaddress (0.8.0)
-- jasmine (2.2.0)
-- jasmine-core (~> 2.2)
-- phantomjs
-- rack (>= 1.2.1)
-- rake
-- jasmine-core (2.2.0)
-- jasmine-jquery-rails (2.0.3)
-- jquery-rails (3.1.2)
-- railties (>= 3.0, < 5.0)
-- thor (>= 0.14, < 2.0)
-- jquery-ui-rails (5.0.3)
-- railties (>= 3.2.16)
-- js-routes (1.0.0)
-- railties (>= 3.2)
-- sprockets-rails
-- js_image_paths (0.0.2)
-- rails (~> 4.0)
-- jshintrb (0.3.0)
-- execjs
-- multi_json (>= 1.3)
-- rake
-- json (1.8.2)
-- jwt (1.4.1)
-- kaminari (0.16.3)
-- actionpack (>= 3.0.0)
-- activesupport (>= 3.0.0)
-- kgio (2.9.3)
-- listen (2.9.0)
-- celluloid (>= 0.15.2)
-- rb-fsevent (>= 0.9.3)
-- rb-inotify (>= 0.9)
-- loofah (2.0.1)
-- nokogiri (>= 1.5.9)
-- lumberjack (1.0.9)
-- macaddr (1.7.1)
-- systemu (~> 2.6.2)
-- mail (2.6.3)
-- mime-types (>= 1.16, < 3)
-- markerb (1.0.2)
-- redcarpet (>= 2.0)
-- messagebus_ruby_api (1.0.3)
-- method_source (0.8.2)
-- mime-types (2.4.3)
-- mini_magick (4.2.0)
-- mini_portile (0.6.2)
-- minitest (5.5.1)
-- mobile-fu (1.3.1)
-- rack-mobile-detect
-- rails
-- multi_json (1.11.0)
-- multi_test (0.1.2)
-- multi_xml (0.5.5)
-- multipart-post (2.0.0)
-- mysql2 (0.3.18)
-- nenv (0.2.0)
-- nested_form (0.3.2)
-- net-scp (1.2.1)
-- net-ssh (>= 2.6.5)
-- net-ssh (2.9.2)
-- nokogiri (1.6.6.2)
-- mini_portile (~> 0.6.0)
-- notiffany (0.0.6)
-- nenv (~> 0.1)
-- shellany (~> 0.0)
-- oauth (0.4.7)
-- oauth2 (0.9.4)
-- faraday (>= 0.8, < 0.10)
-- jwt (~> 1.0)
-- multi_json (~> 1.3)
-- multi_xml (~> 0.5)
-- rack (~> 1.2)
-- omniauth (1.2.2)
-- hashie (>= 1.2, < 4)
-- rack (~> 1.0)
-- omniauth-facebook (1.6.0)
-- omniauth-oauth2 (~> 1.1)
-- omniauth-oauth (1.0.1)
-- oauth
-- omniauth (~> 1.0)
-- omniauth-oauth2 (1.1.2)
-- faraday (>= 0.8, < 0.10)
-- multi_json (~> 1.3)
-- oauth2 (~> 0.9.3)
-- omniauth (~> 1.2)
-- omniauth-tumblr (1.1)
-- omniauth-oauth (~> 1.0)
-- omniauth-twitter (1.0.1)
-- multi_json (~> 1.3)
-- omniauth-oauth (~> 1.0)
-- omniauth-wordpress (0.2.1)
-- omniauth-oauth2 (~> 1.1.0)
-- open_graph_reader (0.5.0)
-- faraday (~> 0.9.0)
-- nokogiri (~> 1.6)
-- orm_adapter (0.5.0)
-- parser (2.2.0.3)
-- ast (>= 1.1, < 3.0)
-- phantomjs (1.9.8.0)
-- powerpack (0.1.0)
-- pry (0.10.1)
-- coderay (~> 1.1.0)
-- method_source (~> 0.8.1)
-- slop (~> 3.4)
-- pry-byebug (3.1.0)
-- byebug (~> 4.0)
-- pry (~> 0.10)
-- pry-debundle (0.8)
-- pry
-- rack (1.6.0)
-- rack-cors (0.3.1)
-- rack-google-analytics (1.2.0)
-- actionpack
-- activesupport
-- rack-mobile-detect (0.4.0)
-- rack
-- rack-piwik (0.3.0)
-- rack-pjax (0.8.0)
-- nokogiri (~> 1.5)
-- rack (~> 1.1)
-- rack-protection (1.5.3)
-- rack
-- rack-rewrite (1.5.1)
-- rack-ssl (1.4.1)
-- rack
-- rack-test (0.6.3)
-- rack (>= 1.0)
-- rails (4.2.1)
-- actionmailer (= 4.2.1)
-- actionpack (= 4.2.1)
-- actionview (= 4.2.1)
-- activejob (= 4.2.1)
-- activemodel (= 4.2.1)
-- activerecord (= 4.2.1)
-- activesupport (= 4.2.1)
-- bundler (>= 1.3.0, < 2.0)
-- railties (= 4.2.1)
-- sprockets-rails
-- rails-assets-diaspora_jsxc (0.1.1)
-- rails-assets-jquery (~> 1.11.1)
-- rails-assets-jquery-colorbox (~> 1.5.14)
-- rails-assets-jquery-fullscreen (~> 1.1.4)
-- rails-assets-jquery-ui (~> 1.10.4)
-- rails-assets-jquery.slimscroll (~> 1.3.3)
-- rails-assets-jasmine (2.2.1)
-- rails-assets-jasmine-ajax (3.1.0)
-- rails-assets-jasmine (~> 2.0)
-- rails-assets-jeresig--jquery.hotkeys (0.2.0)
-- rails-assets-jquery (>= 1.4.2)
-- rails-assets-jquery (1.11.1)
-- 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 (>= 1.6)
-- rails-assets-jquery-textchange (0.2.3)
-- 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 (>= 1.7)
-- rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
-- rails-assets-markdown-it (4.0.3)
-- rails-assets-markdown-it-diaspora-mention (0.3.0)
-- rails-assets-markdown-it-hashtag (0.3.0)
-- rails-assets-markdown-it-sanitizer (0.3.0)
-- 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-deprecated_sanitizer (1.0.3)
-- activesupport (>= 4.2.0.alpha)
-- rails-dom-testing (1.0.6)
-- activesupport (>= 4.2.0.beta, < 5.0)
-- nokogiri (~> 1.6.0)
-- rails-deprecated_sanitizer (>= 1.0.1)
-- rails-html-sanitizer (1.0.2)
-- loofah (~> 2.0)
-- rails-i18n (4.0.4)
-- i18n (~> 0.6)
-- railties (~> 4.0)
-- rails-observers (0.1.2)
-- activemodel (~> 4.0)
-- rails-timeago (2.11.0)
-- actionpack (>= 3.1)
-- activesupport (>= 3.1)
-- rails_admin (0.6.7)
-- builder (~> 3.1)
-- coffee-rails (~> 4.0)
-- font-awesome-rails (>= 3.0, < 5)
-- haml (~> 4.0)
-- jquery-rails (>= 3.0, < 5)
-- jquery-ui-rails (~> 5.0)
-- kaminari (~> 0.14)
-- nested_form (~> 0.3)
-- rack-pjax (~> 0.7)
-- rails (~> 4.0)
-- remotipart (~> 1.0)
-- safe_yaml (~> 1.0)
-- sass-rails (>= 4.0, < 6)
-- railties (4.2.1)
-- actionpack (= 4.2.1)
-- activesupport (= 4.2.1)
-- 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-inotify (0.9.5)
-- ffi (>= 0.5.0)
-- redcarpet (3.2.2)
-- redis (3.2.1)
-- redis-namespace (1.5.1)
-- redis (~> 3.0, >= 3.0.4)
-- remotipart (1.2.1)
-- request_store (1.1.0)
-- responders (2.1.0)
-- railties (>= 4.2.0, < 5)
-- 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.2)
-- rspec-support (~> 3.2.0)
-- rspec-expectations (3.2.0)
-- diff-lcs (>= 1.2.0, < 2.0)
-- rspec-support (~> 3.2.0)
-- rspec-instafail (0.2.6)
-- rspec
-- rspec-mocks (3.2.1)
-- diff-lcs (>= 1.2.0, < 2.0)
-- rspec-support (~> 3.2.0)
-- rspec-rails (3.2.1)
-- actionpack (>= 3.0, < 4.3)
-- activesupport (>= 3.0, < 4.3)
-- railties (>= 3.0, < 4.3)
-- rspec-core (~> 3.2.0)
-- rspec-expectations (~> 3.2.0)
-- rspec-mocks (~> 3.2.0)
-- rspec-support (~> 3.2.0)
-- rspec-support (3.2.2)
-- rubocop (0.29.1)
-- astrolabe (~> 1.3)
-- parser (>= 2.2.0.1, < 3.0)
-- powerpack (~> 0.1)
-- rainbow (>= 1.99.1, < 3.0)
-- ruby-progressbar (~> 1.4)
-- ruby-oembed (0.8.12)
-- ruby-progressbar (1.7.5)
-- rubyzip (1.1.7)
-- safe_yaml (1.0.4)
-- sass (3.4.13)
-- sass-rails (5.0.1)
-- railties (>= 4.0.0, < 5.0)
-- sass (~> 3.1)
-- sprockets (>= 2.8, < 4.0)
-- sprockets-rails (>= 2.0, < 4.0)
-- tilt (~> 1.1)
-- selenium-webdriver (2.45.0)
-- childprocess (~> 0.5)
-- multi_json (~> 1.0)
-- rubyzip (~> 1.0)
-- websocket (~> 1.0)
-- shellany (0.0.1)
-- shoulda-matchers (2.8.0)
-- activesupport (>= 3.0.0)
-- sidekiq (3.3.3)
-- celluloid (>= 0.16.0)
-- connection_pool (>= 2.1.1)
-- json
-- redis (>= 3.0.6)
-- redis-namespace (>= 1.3.1)
-- sidetiq (0.6.3)
-- celluloid (>= 0.14.1)
-- ice_cube (= 0.11.1)
-- sidekiq (>= 3.0.0)
-- simple_captcha2 (0.3.4)
-- rails (>= 4.1)
-- simple_oauth (0.2.0)
-- sinatra (1.4.6)
-- rack (~> 1.4)
-- rack-protection (~> 1.4)
-- tilt (>= 1.3, < 3)
-- sinon-rails (1.10.3)
-- railties (>= 3.1)
-- slop (3.6.0)
-- spring (1.3.3)
-- spring-commands-cucumber (1.0.1)
-- spring (>= 0.9.1)
-- spring-commands-rspec (1.0.4)
-- spring (>= 0.9.1)
-- sprockets (2.12.3)
-- hike (~> 1.2)
-- multi_json (~> 1.0)
-- rack (~> 1.0)
-- tilt (~> 1.1, != 1.3.0)
-- sprockets-rails (2.2.4)
-- actionpack (>= 3.0)
-- activesupport (>= 3.0)
-- sprockets (>= 2.8, < 4.0)
-- systemu (2.6.5)
-- test_after_commit (0.4.1)
-- activerecord (>= 3.2)
-- thor (0.19.1)
-- thread_safe (0.3.5)
-- tilt (1.4.1)
-- timecop (0.7.3)
-- timers (4.0.1)
-- hitimes
-- twitter (4.8.1)
-- faraday (~> 0.8, < 0.10)
-- multi_json (~> 1.0)
-- simple_oauth (~> 0.2)
-- twitter-text (1.11.0)
-- unf (~> 0.1.0)
-- typhoeus (0.7.1)
-- ethon (>= 0.7.1)
-- tzinfo (1.2.2)
-- thread_safe (~> 0.1)
-- uglifier (2.7.1)
-- execjs (>= 0.3.0)
-- json (>= 1.8.0)
-- unf (0.1.4)
-- unf_ext
-- unf_ext (0.0.6)
-- unicorn (4.8.3)
-- kgio (~> 2.6)
-- rack
-- raindrops (~> 0.7)
-- uuid (2.3.7)
-- macaddr (~> 1.0)
-- warden (1.2.3)
-- rack (>= 1.0)
-- webmock (1.20.4)
-- addressable (>= 2.3.6)
-- crack (>= 0.3.2)
-- websocket (1.2.1)
-- will_paginate (3.0.7)
-- xpath (2.0.0)
-- nokogiri (~> 1.3)
-- zip-zip (0.3)
-- rubyzip (>= 1.0.0)
--
--PLATFORMS
-- ruby
--
--DEPENDENCIES
-- actionpack-action_caching
-- actionpack-page_caching
-- active_model_serializers (= 0.9.3)
-- activerecord-import (= 0.7.0)
-- acts-as-taggable-on (= 3.5.0)
-- acts_as_api (= 0.4.2)
-- addressable (= 2.3.7)
-- asset_sync (= 1.1.0)
-- autoprefixer-rails (= 5.1.7.1)
-- backbone-on-rails (= 1.1.2)
-- bootstrap-sass (= 2.3.2.2)
-- capybara (= 2.4.4)
-- carrierwave (= 0.10.0)
-- compass-rails (= 2.0.4)
-- configurate (= 0.2.0)
-- cucumber-rails (= 1.4.2)
-- database_cleaner (= 1.4.1)
-- devise (= 3.4.1)
-- devise-token_authenticatable (~> 0.3.0)
-- devise_lastseenable (= 0.0.4)
-- diaspora-vines (~> 0.1.27)
-- entypo-rails (= 2.2.2)
-- factory_girl_rails (= 4.5.0)
-- faraday (= 0.9.1)
-- faraday-cookie_jar (= 0.0.6)
-- faraday_middleware (= 0.9.1)
-- fixture_builder (= 0.3.6)
-- fog (= 1.28.0)
-- foreman (= 0.62)
-- fuubar (= 2.0.0)
-- gon (= 5.2.3)
-- guard (= 2.12.5)
-- guard-cucumber (= 1.5.4)
-- guard-jshintrb (= 1.1.1)
-- guard-rspec (= 4.5.0)
-- guard-rubocop (= 1.2.0)
-- haml (= 4.0.6)
-- handlebars_assets (= 0.20.1)
-- http_accept_language (= 2.0.5)
-- i18n-inflector-rails (= 1.0.7)
-- jasmine (= 2.2.0)
-- jasmine-jquery-rails (= 2.0.3)
-- jquery-rails (= 3.1.2)
-- js-routes (= 1.0.0)
-- js_image_paths (= 0.0.2)
-- jshintrb (= 0.3.0)
-- json (= 1.8.2)
-- markerb (= 1.0.2)
-- messagebus_ruby_api (= 1.0.3)
-- mini_magick (= 4.2.0)
-- minitest
-- mobile-fu (= 1.3.1)
-- mysql2 (= 0.3.18)
-- nokogiri (= 1.6.6.2)
-- omniauth (= 1.2.2)
-- omniauth-facebook (= 1.6.0)
-- omniauth-tumblr (= 1.1)
-- omniauth-twitter (= 1.0.1)
-- omniauth-wordpress (= 0.2.1)
-- open_graph_reader (= 0.5.0)
-- pry
-- pry-byebug
-- pry-debundle
-- rack-cors (= 0.3.1)
-- rack-google-analytics (= 1.2.0)
-- rack-piwik (= 0.3.0)
-- rack-protection (= 1.5.3)
-- rack-rewrite (= 1.5.1)
-- rack-ssl (= 1.4.1)
-- rails (= 4.2.1)
-- rails-assets-diaspora_jsxc (~> 0.1.1)!
-- rails-assets-jasmine-ajax (= 3.1.0)!
-- rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
-- rails-assets-jquery (= 1.11.1)!
-- rails-assets-jquery-idletimer (= 1.0.1)!
-- rails-assets-jquery-placeholder (= 2.1.1)!
-- rails-assets-jquery-textchange (= 0.2.3)!
-- rails-assets-markdown-it (= 4.0.3)!
-- rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)!
-- rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
-- rails-assets-markdown-it-hashtag (= 0.3.0)!
-- rails-assets-markdown-it-sanitizer (= 0.3.0)!
-- rails-assets-markdown-it-sub (= 1.0.0)!
-- rails-assets-markdown-it-sup (= 1.0.0)!
-- rails-assets-perfect-scrollbar (= 0.5.9)!
-- rails-i18n (= 4.0.4)
-- rails-timeago (= 2.11.0)
-- rails_admin (= 0.6.7)
-- rb-fsevent (= 0.9.4)
-- rb-inotify (= 0.9.5)
-- redcarpet (= 3.2.2)
-- remotipart (= 1.2.1)
-- responders (= 2.1.0)
-- roxml (= 3.1.6)
-- rspec-instafail (= 0.2.6)
-- rspec-rails (= 3.2.1)
-- rubocop (= 0.29.1)
-- ruby-oembed (= 0.8.12)
-- sass-rails (= 5.0.1)
-- selenium-webdriver (= 2.45.0)
-- shoulda-matchers (= 2.8.0)
-- sidekiq (= 3.3.3)
-- sidetiq (= 0.6.3)
-- simple_captcha2 (= 0.3.4)
-- sinatra (= 1.4.6)
-- sinon-rails (= 1.10.3)
-- spring (= 1.3.3)
-- spring-commands-cucumber (= 1.0.1)
-- spring-commands-rspec (= 1.0.4)
-- test_after_commit (= 0.4.1)
-- timecop (= 0.7.3)
-- twitter (= 4.8.1)
-- twitter-text (= 1.11.0)
-- typhoeus (= 0.7.1)
-- uglifier (= 2.7.1)
-- unicorn (= 4.8.3)
-- uuid (= 2.3.7)
-- webmock (= 1.20.4)
-- will_paginate (= 3.0.7)
-- zip-zip
diff --git a/debian/patches/018-loosen-rails-timeago.patch b/debian/patches/018-loosen-rails-timeago.patch
index 991e02c..d8bf628 100644
--- a/debian/patches/018-loosen-rails-timeago.patch
+++ b/debian/patches/018-loosen-rails-timeago.patch
@@ -2,12 +2,113 @@ Index: diaspora/Gemfile
===================================================================
--- diaspora.orig/Gemfile
+++ diaspora/Gemfile
-@@ -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
+@@ -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
--
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