[DRE-commits] [diaspora] 213/257: recreate Gemfile.lock removal patch

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sun Apr 12 14:17:29 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 8881e7bb2dd83ecae716d23c821d07585bc04030
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Mar 30 11:58:50 2015 +0530

    recreate Gemfile.lock removal patch
---
 Gemfile                                      |  62 ---
 debian/patches/003-remove-gemfile-lock.patch | 611 ++++++++++++++++-----------
 2 files changed, 365 insertions(+), 308 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8027b88..e82fb1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -211,65 +211,3 @@ group :production do # we don"t install these on travis to speed up test runs
 
   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
diff --git a/debian/patches/003-remove-gemfile-lock.patch b/debian/patches/003-remove-gemfile-lock.patch
index 64be7a8..6cba24a 100644
--- a/debian/patches/003-remove-gemfile-lock.patch
+++ b/debian/patches/003-remove-gemfile-lock.patch
@@ -2,60 +2,77 @@ Index: diaspora/Gemfile.lock
 ===================================================================
 --- diaspora.orig/Gemfile.lock
 +++ /dev/null
-@@ -1,702 +0,0 @@
+@@ -1,821 +0,0 @@
 -GEM
 -  remote: https://rubygems.org/
 -  remote: https://rails-assets.org/
 -  specs:
--    CFPropertyList (2.2.8)
--    actionmailer (4.1.8)
--      actionpack (= 4.1.8)
--      actionview (= 4.1.8)
+-    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)
--    actionpack (4.1.8)
--      actionview (= 4.1.8)
--      activesupport (= 4.1.8)
--      rack (~> 1.5.2)
+-      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.1.8)
--      activesupport (= 4.1.8)
+-    actionview (4.2.1)
+-      activesupport (= 4.2.1)
 -      builder (~> 3.1)
 -      erubis (~> 2.7.0)
--    activemodel (4.1.8)
--      activesupport (= 4.1.8)
+-      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.1.8)
--      activemodel (= 4.1.8)
--      activesupport (= 4.1.8)
--      arel (~> 5.0.0)
--    activerecord-import (0.6.0)
+-    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.1.8)
--      i18n (~> 0.6, >= 0.6.9)
+-    activesupport (4.2.1)
+-      i18n (~> 0.7)
 -      json (~> 1.7, >= 1.7.7)
 -      minitest (~> 5.1)
--      thread_safe (~> 0.1)
+-      thread_safe (~> 0.3, >= 0.3.4)
 -      tzinfo (~> 1.1)
--    acts-as-taggable-on (3.4.2)
+-    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.6)
--    arel (5.0.1.20140414130214)
+-    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
@@ -65,14 +82,12 @@ Index: diaspora/Gemfile.lock
 -      ejs
 -      jquery-rails
 -      railties
--    bcrypt (3.1.9)
+-    bcrypt (3.1.10)
 -    bootstrap-sass (2.3.2.2)
 -      sass (~> 3.2)
 -    builder (3.2.2)
--    byebug (3.5.1)
--      columnize (~> 0.8)
--      debugger-linecache (~> 1.2)
--      slop (~> 3.6)
+-    byebug (4.0.3)
+-      columnize (= 0.9.0)
 -    capybara (2.4.4)
 -      mime-types (>= 1.16)
 -      nokogiri (>= 1.3.3)
@@ -88,7 +103,7 @@ Index: diaspora/Gemfile.lock
 -      timers (~> 4.0.0)
 -    childprocess (0.5.5)
 -      ffi (~> 1.0, >= 1.0.11)
--    chunky_png (1.3.3)
+-    chunky_png (1.3.4)
 -    coderay (1.1.0)
 -    coffee-rails (4.1.0)
 -      coffee-script (>= 2.2.0)
@@ -96,32 +111,41 @@ Index: diaspora/Gemfile.lock
 -    coffee-script (2.3.0)
 -      coffee-script-source
 -      execjs
--    coffee-script-source (1.8.0)
--    columnize (0.8.9)
--    compass (0.12.7)
+-    coffee-script-source (1.9.1)
+-    columnize (0.9.0)
+-    compass (1.0.3)
 -      chunky_png (~> 1.2)
--      fssm (>= 0.2.7)
--      sass (~> 3.2.19)
--    compass-rails (2.0.0)
--      compass (>= 0.12.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.0)
+-    connection_pool (2.1.3)
 -    crack (0.4.2)
 -      safe_yaml (~> 1.0.0)
--    cucumber (1.3.17)
+-    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.1)
+-      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.3.0)
--    debugger-linecache (1.2.0)
+-    database_cleaner (1.4.1)
 -    devise (3.4.1)
 -      bcrypt (~> 3.0)
 -      orm_adapter (~> 0.1)
@@ -138,14 +162,16 @@ Index: diaspora/Gemfile.lock
 -      rails (>= 3.0.4)
 -      warden
 -      warden
--    diaspora-vines (0.1.25)
--      activerecord (~> 4.1.4)
+-    diaspora-vines (0.1.27)
+-      activerecord (~> 4.1)
 -      bcrypt (~> 3.1)
 -      em-hiredis (~> 0.3.0)
--      eventmachine (~> 1.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
@@ -158,55 +184,74 @@ Index: diaspora/Gemfile.lock
 -    entypo-rails (2.2.2)
 -      railties (>= 3.1, <= 5)
 -    erubis (2.7.0)
--    ethon (0.7.1)
+-    ethon (0.7.3)
 -      ffi (>= 1.3.0)
--    eventmachine (1.0.3)
--    excon (0.41.0)
--    execjs (2.2.2)
+-    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.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.6)
+-    ffi (1.9.8)
 -    fission (0.5.0)
 -      CFPropertyList (~> 2.2)
 -    fixture_builder (0.3.6)
 -      activerecord (>= 2)
 -      activesupport (>= 2)
--    fog (1.25.0)
+-    fog (1.28.0)
+-      fog-atmos
+-      fog-aws (~> 0.0)
 -      fog-brightbox (~> 0.4)
--      fog-core (~> 1.25)
+-      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)
--      opennebula
--    fog-brightbox (0.6.1)
+-    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
--    fog-core (1.25.0)
+-      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.1)
+-    fog-profitbricks (0.0.2)
 -      fog-core
 -      fog-xml
 -      nokogiri
@@ -214,72 +259,91 @@ Index: diaspora/Gemfile.lock
 -      fog-core (>= 1.21.0)
 -      fog-json
 -      fog-xml (>= 0.0.1)
--    fog-sakuracloud (0.1.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-softlayer (0.3.24)
+-    fog-storm_on_demand (0.1.0)
 -      fog-core
 -      fog-json
--    fog-terremark (0.0.3)
+-    fog-terremark (0.0.4)
 -      fog-core
 -      fog-xml
 -    fog-vmfusion (0.0.1)
 -      fission
 -      fog-core
--    fog-voxel (0.0.1)
+-    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.2.0.0)
+-    font-awesome-rails (4.3.0.0)
 -      railties (>= 3.2, < 5.0)
--    foreigner (1.6.1)
--      activerecord (>= 3.0.0)
 -    foreman (0.62.0)
 -      thor (>= 0.13.6)
 -    formatador (0.2.5)
--    fssm (0.2.10)
 -    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.8.2)
+-    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-cucumber (1.5.1)
+-    guard-compat (1.2.1)
+-    guard-cucumber (1.5.4)
 -      cucumber (>= 1.3.0)
--      guard (>= 2.0.0)
--    guard-rspec (4.3.1)
+-      guard-compat (~> 1.0)
+-      nenv (~> 0.1)
+-    guard-jshintrb (1.1.1)
+-      guard (~> 2.0)
+-      jshintrb
+-    guard-rspec (4.5.0)
 -      guard (~> 2.1)
--      rspec (>= 2.14, < 4.0)
--    guard-spork (2.0.1)
--      childprocess (>= 0.2.3)
--      guard (~> 2.8.2)
--      spork (>= 0.8.4)
--    haml (4.0.5)
+-      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.18)
--      execjs (>= 1.2.9)
--      multi_json
--      sprockets (>= 2.0.3)
--      tilt
--    hashie (3.3.1)
+-    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_accept_language (2.0.2)
+-    http-cookie (1.0.2)
+-      domain_name (~> 0.5)
+-    http_accept_language (2.0.5)
 -    http_parser.rb (0.6.0)
--    i18n (0.6.11)
+-    i18n (0.7.0)
 -    i18n-inflector (2.6.7)
 -      i18n (>= 0.4.1)
 -    i18n-inflector-rails (1.0.7)
@@ -289,33 +353,39 @@ Index: diaspora/Gemfile.lock
 -    ice_cube (0.11.1)
 -    inflecto (0.0.2)
 -    ipaddress (0.8.0)
--    jasmine (2.1.0)
--      jasmine-core (~> 2.1.0)
+-    jasmine (2.2.0)
+-      jasmine-core (~> 2.2)
 -      phantomjs
 -      rack (>= 1.2.1)
 -      rake
--    jasmine-core (2.1.2)
+-    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.2)
+-    jquery-ui-rails (5.0.3)
 -      railties (>= 3.2.16)
--    js-routes (0.9.9)
+-    js-routes (1.0.0)
 -      railties (>= 3.2)
 -      sprockets-rails
--    js_image_paths (0.0.1)
+-    js_image_paths (0.0.2)
 -      rails (~> 4.0)
--    json (1.8.1)
--    jwt (1.0.0)
--    kaminari (0.16.1)
+-    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.2)
--    listen (2.8.1)
+-    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)
@@ -326,23 +396,27 @@ Index: diaspora/Gemfile.lock
 -    messagebus_ruby_api (1.0.3)
 -    method_source (0.8.2)
 -    mime-types (2.4.3)
--    mini_magick (4.0.1)
--    mini_portile (0.6.1)
--    minitest (5.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.10.1)
--    multi_test (0.1.1)
+-    multi_json (1.11.0)
+-    multi_test (0.1.2)
 -    multi_xml (0.5.5)
 -    multipart-post (2.0.0)
--    mysql2 (0.3.17)
+-    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.1)
--    nokogiri (1.6.4.1)
+-    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)
@@ -370,26 +444,25 @@ Index: diaspora/Gemfile.lock
 -      omniauth-oauth (~> 1.0)
 -    omniauth-wordpress (0.2.1)
 -      omniauth-oauth2 (~> 1.1.0)
--    opengraph_parser (0.2.3)
--      addressable
--      nokogiri
--    opennebula (4.10.1)
--      json
--      nokogiri
--      rbvmomi
+-    open_graph_reader (0.5.0)
+-      faraday (~> 0.9.0)
+-      nokogiri (~> 1.6)
 -    orm_adapter (0.5.0)
--    phantomjs (1.9.7.1)
+-    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 (2.0.0)
--      byebug (~> 3.4)
+-    pry-byebug (3.1.0)
+-      byebug (~> 4.0)
 -      pry (~> 0.10)
 -    pry-debundle (0.8)
 -      pry
--    rack (1.5.2)
--    rack-cors (0.2.9)
+-    rack (1.6.0)
+-    rack-cors (0.3.1)
 -    rack-google-analytics (1.2.0)
 -      actionpack
 -      activesupport
@@ -399,47 +472,66 @@ Index: diaspora/Gemfile.lock
 -    rack-pjax (0.8.0)
 -      nokogiri (~> 1.5)
 -      rack (~> 1.1)
--    rack-protection (1.5.2)
+-    rack-protection (1.5.3)
 -      rack
--    rack-rewrite (1.5.0)
+-    rack-rewrite (1.5.1)
 -    rack-ssl (1.4.1)
 -      rack
--    rack-test (0.6.2)
+-    rack-test (0.6.3)
 -      rack (>= 1.0)
--    rails (4.1.8)
--      actionmailer (= 4.1.8)
--      actionpack (= 4.1.8)
--      actionview (= 4.1.8)
--      activemodel (= 4.1.8)
--      activerecord (= 4.1.8)
--      activesupport (= 4.1.8)
+-    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.1.8)
--      sprockets-rails (~> 2.0)
--    rails-assets-diaspora_jsxc (0.0.9)
+-      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.14)
+-    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.0.8)
+-    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-perfect-scrollbar (0.5.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-assets-punycode (1.3.2)
--    rails-i18n (4.0.3)
+-    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)
@@ -447,12 +539,12 @@ Index: diaspora/Gemfile.lock
 -    rails-timeago (2.11.0)
 -      actionpack (>= 3.1)
 -      activesupport (>= 3.1)
--    rails_admin (0.6.5)
+-    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)
+-      jquery-rails (>= 3.0, < 5)
 -      jquery-ui-rails (~> 5.0)
 -      kaminari (~> 0.14)
 -      nested_form (~> 0.3)
@@ -460,72 +552,80 @@ Index: diaspora/Gemfile.lock
 -      rails (~> 4.0)
 -      remotipart (~> 1.0)
 -      safe_yaml (~> 1.0)
--      sass-rails (~> 4.0)
--    railties (4.1.8)
--      actionpack (= 4.1.8)
--      activesupport (= 4.1.8)
+-      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.3.2)
+-    rake (10.4.2)
 -    rb-fsevent (0.9.4)
 -    rb-inotify (0.9.5)
 -      ffi (>= 0.5.0)
--    rbvmomi (1.8.2)
--      builder
--      nokogiri (>= 1.4.1)
--      trollop
--    redcarpet (3.2.0)
--    redis (3.1.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 (1.1.2)
--      railties (>= 3.2, < 4.2)
+-    responders (2.1.0)
+-      railties (>= 4.2.0, < 5)
 -    roxml (3.1.6)
 -      activesupport (>= 2.3.0)
 -      nokogiri (>= 1.3.3)
--    rspec (3.1.0)
--      rspec-core (~> 3.1.0)
--      rspec-expectations (~> 3.1.0)
--      rspec-mocks (~> 3.1.0)
--    rspec-core (3.1.7)
--      rspec-support (~> 3.1.0)
--    rspec-expectations (3.1.2)
+-    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.1.0)
--    rspec-instafail (0.2.5)
+-      rspec-support (~> 3.2.0)
+-    rspec-instafail (0.2.6)
 -      rspec
--    rspec-mocks (3.1.3)
--      rspec-support (~> 3.1.0)
--    rspec-rails (3.1.0)
--      actionpack (>= 3.0)
--      activesupport (>= 3.0)
--      railties (>= 3.0)
--      rspec-core (~> 3.1.0)
--      rspec-expectations (~> 3.1.0)
--      rspec-mocks (~> 3.1.0)
--      rspec-support (~> 3.1.0)
--    rspec-support (3.1.2)
--    ruby-oembed (0.8.11)
--    ruby-progressbar (1.7.0)
--    rubyzip (1.1.6)
+-    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.2.19)
--    sass-rails (4.0.4)
+-    sass (3.4.13)
+-    sass-rails (5.0.1)
 -      railties (>= 4.0.0, < 5.0)
--      sass (~> 3.2.2)
--      sprockets (~> 2.8, < 2.12)
--      sprockets-rails (~> 2.0)
--    selenium-webdriver (2.44.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)
--    sidekiq (3.3.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.0.0)
+-      connection_pool (>= 2.1.1)
 -      json
 -      redis (>= 3.0.6)
 -      redis-namespace (>= 1.3.1)
@@ -533,47 +633,50 @@ Index: diaspora/Gemfile.lock
 -      celluloid (>= 0.14.1)
 -      ice_cube (= 0.11.1)
 -      sidekiq (>= 3.0.0)
--    simple_captcha2 (0.3.2)
+-    simple_captcha2 (0.3.4)
 -      rails (>= 4.1)
 -    simple_oauth (0.2.0)
--    sinatra (1.4.5)
+-    sinatra (1.4.6)
 -      rack (~> 1.4)
 -      rack-protection (~> 1.4)
--      tilt (~> 1.3, >= 1.3.4)
+-      tilt (>= 1.3, < 3)
 -    sinon-rails (1.10.3)
 -      railties (>= 3.1)
 -    slop (3.6.0)
--    spork (1.0.0rc4)
--    sprockets (2.11.3)
+-    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.1)
+-    sprockets-rails (2.2.4)
 -      actionpack (>= 3.0)
 -      activesupport (>= 3.0)
 -      sprockets (>= 2.8, < 4.0)
--    systemu (2.6.4)
--    test_after_commit (0.4.0)
+-    systemu (2.6.5)
+-    test_after_commit (0.4.1)
 -      activerecord (>= 3.2)
 -    thor (0.19.1)
--    thread_safe (0.3.4)
+-    thread_safe (0.3.5)
 -    tilt (1.4.1)
--    timecop (0.7.1)
+-    timecop (0.7.3)
 -    timers (4.0.1)
 -      hitimes
--    trollop (2.0)
 -    twitter (4.8.1)
 -      faraday (~> 0.8, < 0.10)
 -      multi_json (~> 1.0)
 -      simple_oauth (~> 0.2)
--    twitter-text (1.10.0)
+-    twitter-text (1.11.0)
 -      unf (~> 0.1.0)
--    typhoeus (0.6.9)
+-    typhoeus (0.7.1)
 -      ethon (>= 0.7.1)
 -    tzinfo (1.2.2)
 -      thread_safe (~> 0.1)
--    uglifier (2.5.3)
+-    uglifier (2.7.1)
 -      execjs (>= 0.3.0)
 -      json (>= 1.8.0)
 -    unf (0.1.4)
@@ -603,103 +706,119 @@ Index: diaspora/Gemfile.lock
 -DEPENDENCIES
 -  actionpack-action_caching
 -  actionpack-page_caching
--  activerecord-import (= 0.6.0)
--  acts-as-taggable-on (= 3.4.2)
+-  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.6)
+-  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.0)
+-  compass-rails (= 2.0.4)
 -  configurate (= 0.2.0)
 -  cucumber-rails (= 1.4.2)
--  database_cleaner (= 1.3.0)
+-  database_cleaner (= 1.4.1)
 -  devise (= 3.4.1)
 -  devise-token_authenticatable (~> 0.3.0)
 -  devise_lastseenable (= 0.0.4)
--  diaspora-vines (~> 0.1.25)
+-  diaspora-vines (~> 0.1.27)
 -  entypo-rails (= 2.2.2)
 -  factory_girl_rails (= 4.5.0)
--  faraday (= 0.9.0)
+-  faraday (= 0.9.1)
+-  faraday-cookie_jar (= 0.0.6)
 -  faraday_middleware (= 0.9.1)
 -  fixture_builder (= 0.3.6)
--  fog (= 1.25.0)
--  foreigner (= 1.6.1)
+-  fog (= 1.28.0)
 -  foreman (= 0.62)
 -  fuubar (= 2.0.0)
 -  gon (= 5.2.3)
--  guard (= 2.8.2)
--  guard-cucumber (= 1.5.1)
--  guard-rspec (= 4.3.1)
--  guard-spork (= 2.0.1)
--  haml (= 4.0.5)
--  handlebars_assets (= 0.18.0)
--  http_accept_language (= 2.0.2)
+-  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.1.0)
+-  jasmine (= 2.2.0)
 -  jasmine-jquery-rails (= 2.0.3)
 -  jquery-rails (= 3.1.2)
--  js-routes (= 0.9.9)
--  js_image_paths (= 0.0.1)
--  json (= 1.8.1)
+-  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.0.1)
+-  mini_magick (= 4.2.0)
 -  minitest
 -  mobile-fu (= 1.3.1)
--  mysql2 (= 0.3.17)
--  nokogiri (= 1.6.4.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)
--  opengraph_parser (= 0.2.3)
+-  open_graph_reader (= 0.5.0)
 -  pry
 -  pry-byebug
 -  pry-debundle
--  rack-cors (= 0.2.9)
+-  rack-cors (= 0.3.1)
 -  rack-google-analytics (= 1.2.0)
 -  rack-piwik (= 0.3.0)
--  rack-protection (= 1.5.2)
--  rack-rewrite (= 1.5.0)
+-  rack-protection (= 1.5.3)
+-  rack-rewrite (= 1.5.1)
 -  rack-ssl (= 1.4.1)
--  rails (= 4.1.8)
--  rails-assets-diaspora_jsxc (~> 0.0.9)
--  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.0.8)
--  rails-assets-jquery-textchange (= 0.2.3)
--  rails-assets-perfect-scrollbar (= 0.5.7)
--  rails-assets-punycode (= 1.3.2)
--  rails-i18n (= 4.0.3)
+-  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.5)
+-  rails_admin (= 0.6.7)
 -  rb-fsevent (= 0.9.4)
 -  rb-inotify (= 0.9.5)
--  redcarpet (= 3.2.0)
+-  redcarpet (= 3.2.2)
 -  remotipart (= 1.2.1)
+-  responders (= 2.1.0)
 -  roxml (= 3.1.6)
--  rspec-instafail (= 0.2.5)
--  rspec-rails (= 3.1.0)
--  ruby-oembed (= 0.8.11)
--  sass-rails (= 4.0.4)
--  selenium-webdriver (= 2.44.0)
--  sidekiq (= 3.3.0)
+-  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.2)
--  sinatra (= 1.4.5)
+-  simple_captcha2 (= 0.3.4)
+-  sinatra (= 1.4.6)
 -  sinon-rails (= 1.10.3)
--  spork (= 1.0.0rc4)
--  test_after_commit (= 0.4.0)
--  timecop (= 0.7.1)
+-  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.10.0)
--  typhoeus (= 0.6.9)
--  uglifier (= 2.5.3)
+-  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)

-- 
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