Merge pull request #5420 from diaspora/update_gems
Update gems Conflicts: Gemfile.lock
This commit is contained in:
Jonne Haß
commit
10f3a071c5
2 changed files with 95 additions and 64 deletions
16
Gemfile
16
Gemfile
|
|
@ -1,7 +1,7 @@
|
|||
source 'https://rubygems.org'
|
||||
source 'https://rails-assets.org'
|
||||
|
||||
gem 'rails', '4.1.7'
|
||||
gem 'rails', '4.1.8'
|
||||
|
||||
# Legacy Rails features, remove me!
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
|
|||
|
||||
# Background processing
|
||||
|
||||
gem 'sidekiq', '3.2.6'
|
||||
gem 'sidekiq', '3.3.0'
|
||||
gem 'sinatra', '1.3.3'
|
||||
|
||||
# Scheduled processing
|
||||
|
|
@ -59,7 +59,7 @@ gem 'sass-rails', '4.0.4'
|
|||
|
||||
ENV['DB'] ||= 'mysql'
|
||||
|
||||
gem 'mysql2', '0.3.16' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
|
||||
gem 'mysql2', '0.3.17' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
|
||||
gem 'pg', '0.17.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
|
||||
|
||||
gem 'activerecord-import', '0.6.0'
|
||||
|
|
@ -68,8 +68,8 @@ gem 'foreigner', '1.6.1'
|
|||
# File uploading
|
||||
|
||||
gem 'carrierwave', '0.10.0'
|
||||
gem 'fog', '1.24.0'
|
||||
gem 'mini_magick', '3.8.1'
|
||||
gem 'fog', '1.25.0'
|
||||
gem 'mini_magick', '4.0.1'
|
||||
gem 'remotipart', '1.2.1'
|
||||
|
||||
# GUID generation
|
||||
|
|
@ -195,13 +195,13 @@ group :development do
|
|||
# Automatic test runs
|
||||
gem 'guard-cucumber', '1.5.1'
|
||||
gem 'guard-rspec', '4.3.1'
|
||||
gem 'guard', '2.7.3', :require => false
|
||||
gem 'guard', '2.8.2', :require => false
|
||||
gem 'rb-fsevent', '0.9.4', :require => false
|
||||
gem 'rb-inotify', '0.9.5', :require => false
|
||||
|
||||
# Preloading environment
|
||||
|
||||
gem 'guard-spork', '1.5.1'
|
||||
gem 'guard-spork', '2.0.1'
|
||||
gem 'spork', '1.0.0rc4'
|
||||
|
||||
# Debugging
|
||||
|
|
@ -240,7 +240,7 @@ group :development, :test do
|
|||
gem 'cucumber-rails', '1.4.2', :require => false
|
||||
|
||||
# Jasmine (client side application tests (JS))
|
||||
gem 'jasmine', '2.0.3'
|
||||
gem 'jasmine', '2.1.0'
|
||||
gem 'jasmine-jquery-rails', '2.0.3'
|
||||
gem 'sinon-rails', '1.10.3'
|
||||
end
|
||||
|
|
|
|||
143
Gemfile.lock
143
Gemfile.lock
|
|
@ -2,29 +2,30 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
remote: https://rails-assets.org/
|
||||
specs:
|
||||
actionmailer (4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
CFPropertyList (2.2.8)
|
||||
actionmailer (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
actionpack (4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
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.7)
|
||||
activesupport (= 4.1.7)
|
||||
actionview (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
activemodel (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.7)
|
||||
activemodel (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
activerecord (4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
arel (~> 5.0.0)
|
||||
activerecord-import (0.6.0)
|
||||
activerecord (>= 3.0)
|
||||
|
|
@ -32,7 +33,7 @@ GEM
|
|||
activemodel (~> 4.0)
|
||||
activesupport (~> 4.0)
|
||||
rails-observers (~> 0.1.1)
|
||||
activesupport (4.1.7)
|
||||
activesupport (4.1.8)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -78,8 +79,8 @@ GEM
|
|||
activesupport (>= 3.2.0)
|
||||
json (>= 1.7)
|
||||
mime-types (>= 1.16)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
celluloid (0.16.0)
|
||||
timers (~> 4.0.0)
|
||||
childprocess (0.5.5)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chunky_png (1.3.3)
|
||||
|
|
@ -99,7 +100,7 @@ GEM
|
|||
compass-rails (2.0.0)
|
||||
compass (>= 0.12.2)
|
||||
configurate (0.2.0)
|
||||
connection_pool (2.0.0)
|
||||
connection_pool (2.1.0)
|
||||
crack (0.4.2)
|
||||
safe_yaml (~> 1.0.0)
|
||||
cucumber (1.3.17)
|
||||
|
|
@ -167,23 +168,31 @@ GEM
|
|||
faraday_middleware (0.9.1)
|
||||
faraday (>= 0.7.4, < 0.10)
|
||||
ffi (1.9.6)
|
||||
fission (0.5.0)
|
||||
CFPropertyList (~> 2.2)
|
||||
fixture_builder (0.3.6)
|
||||
activerecord (>= 2)
|
||||
activesupport (>= 2)
|
||||
fog (1.24.0)
|
||||
fog-brightbox
|
||||
fog-core (~> 1.23)
|
||||
fog (1.25.0)
|
||||
fog-brightbox (~> 0.4)
|
||||
fog-core (~> 1.25)
|
||||
fog-json
|
||||
fog-profitbricks
|
||||
fog-radosgw (>= 0.0.2)
|
||||
fog-sakuracloud (>= 0.0.4)
|
||||
fog-softlayer
|
||||
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-core (~> 1.22)
|
||||
fog-json
|
||||
inflecto
|
||||
fog-core (1.24.0)
|
||||
fog-core (1.25.0)
|
||||
builder
|
||||
excon (~> 0.38)
|
||||
formatador (~> 0.2)
|
||||
|
|
@ -192,6 +201,10 @@ GEM
|
|||
net-ssh (>= 2.1.3)
|
||||
fog-json (1.0.0)
|
||||
multi_json (~> 1.0)
|
||||
fog-profitbricks (0.0.1)
|
||||
fog-core
|
||||
fog-xml
|
||||
nokogiri
|
||||
fog-radosgw (0.0.3)
|
||||
fog-core (>= 1.21.0)
|
||||
fog-json
|
||||
|
|
@ -202,6 +215,15 @@ GEM
|
|||
fog-softlayer (0.3.24)
|
||||
fog-core
|
||||
fog-json
|
||||
fog-terremark (0.0.3)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-vmfusion (0.0.1)
|
||||
fission
|
||||
fog-core
|
||||
fog-voxel (0.0.1)
|
||||
fog-core
|
||||
fog-xml
|
||||
fog-xml (0.1.1)
|
||||
fog-core
|
||||
nokogiri (~> 1.5, >= 1.5.11)
|
||||
|
|
@ -223,7 +245,7 @@ GEM
|
|||
json
|
||||
multi_json
|
||||
request_store (>= 1.0.5)
|
||||
guard (2.7.3)
|
||||
guard (2.8.2)
|
||||
formatador (>= 0.2.4)
|
||||
listen (~> 2.7)
|
||||
lumberjack (~> 1.0)
|
||||
|
|
@ -235,9 +257,9 @@ GEM
|
|||
guard-rspec (4.3.1)
|
||||
guard (~> 2.1)
|
||||
rspec (>= 2.14, < 4.0)
|
||||
guard-spork (1.5.1)
|
||||
guard-spork (2.0.1)
|
||||
childprocess (>= 0.2.3)
|
||||
guard (>= 1.1)
|
||||
guard (~> 2.8.2)
|
||||
spork (>= 0.8.4)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
|
|
@ -249,6 +271,7 @@ GEM
|
|||
hashie (3.3.1)
|
||||
hike (1.2.3)
|
||||
hiredis (0.5.2)
|
||||
hitimes (1.2.2)
|
||||
http_accept_language (2.0.2)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.6.11)
|
||||
|
|
@ -261,12 +284,12 @@ GEM
|
|||
ice_cube (0.11.1)
|
||||
inflecto (0.0.2)
|
||||
ipaddress (0.8.0)
|
||||
jasmine (2.0.3)
|
||||
jasmine-core (~> 2.0.0)
|
||||
jasmine (2.1.0)
|
||||
jasmine-core (~> 2.1.0)
|
||||
phantomjs
|
||||
rack (>= 1.2.1)
|
||||
rake
|
||||
jasmine-core (2.0.2)
|
||||
jasmine-core (2.1.2)
|
||||
jasmine-jquery-rails (2.0.3)
|
||||
jquery-rails (3.1.2)
|
||||
railties (>= 3.0, < 5.0)
|
||||
|
|
@ -284,7 +307,7 @@ GEM
|
|||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
kgio (2.9.2)
|
||||
listen (2.7.11)
|
||||
listen (2.8.1)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
|
|
@ -298,10 +321,9 @@ GEM
|
|||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.4.3)
|
||||
mini_magick (3.8.1)
|
||||
subexec (~> 0.2.1)
|
||||
mini_magick (4.0.1)
|
||||
mini_portile (0.6.1)
|
||||
minitest (5.4.2)
|
||||
minitest (5.4.3)
|
||||
mobile-fu (1.3.1)
|
||||
rack-mobile-detect
|
||||
rails
|
||||
|
|
@ -309,7 +331,7 @@ GEM
|
|||
multi_test (0.1.1)
|
||||
multi_xml (0.5.5)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.3.16)
|
||||
mysql2 (0.3.17)
|
||||
nested_form (0.3.2)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
|
|
@ -346,6 +368,10 @@ GEM
|
|||
opengraph_parser (0.2.3)
|
||||
addressable
|
||||
nokogiri
|
||||
opennebula (4.10.1)
|
||||
json
|
||||
nokogiri
|
||||
rbvmomi
|
||||
orm_adapter (0.5.0)
|
||||
phantomjs (1.9.7.1)
|
||||
pry (0.10.1)
|
||||
|
|
@ -375,15 +401,15 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.7)
|
||||
actionmailer (= 4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
activemodel (= 4.1.7)
|
||||
activerecord (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
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)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.1.7)
|
||||
railties (= 4.1.8)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-assets-diaspora_jsxc (0.0.8)
|
||||
rails-assets-jquery (~> 1.11.1)
|
||||
|
|
@ -430,9 +456,9 @@ GEM
|
|||
remotipart (~> 1.0)
|
||||
safe_yaml (~> 1.0)
|
||||
sass-rails (~> 4.0)
|
||||
railties (4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
railties (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
raindrops (0.13.0)
|
||||
|
|
@ -440,6 +466,10 @@ GEM
|
|||
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)
|
||||
redis-namespace (1.5.1)
|
||||
|
|
@ -488,8 +518,8 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
sidekiq (3.2.6)
|
||||
celluloid (= 0.15.2)
|
||||
sidekiq (3.3.0)
|
||||
celluloid (>= 0.16.0)
|
||||
connection_pool (>= 2.0.0)
|
||||
json
|
||||
redis (>= 3.0.6)
|
||||
|
|
@ -514,11 +544,10 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.2.0)
|
||||
sprockets-rails (2.2.1)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
subexec (0.2.3)
|
||||
systemu (2.6.4)
|
||||
test_after_commit (0.4.0)
|
||||
activerecord (>= 3.2)
|
||||
|
|
@ -526,7 +555,9 @@ GEM
|
|||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
timecop (0.7.1)
|
||||
timers (1.1.0)
|
||||
timers (4.0.1)
|
||||
hitimes
|
||||
trollop (2.0)
|
||||
twitter (4.8.1)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -589,20 +620,20 @@ DEPENDENCIES
|
|||
faraday (= 0.9.0)
|
||||
faraday_middleware (= 0.9.1)
|
||||
fixture_builder (= 0.3.6)
|
||||
fog (= 1.24.0)
|
||||
fog (= 1.25.0)
|
||||
foreigner (= 1.6.1)
|
||||
foreman (= 0.62)
|
||||
fuubar (= 2.0.0)
|
||||
gon (= 5.2.3)
|
||||
guard (= 2.7.3)
|
||||
guard (= 2.8.2)
|
||||
guard-cucumber (= 1.5.1)
|
||||
guard-rspec (= 4.3.1)
|
||||
guard-spork (= 1.5.1)
|
||||
guard-spork (= 2.0.1)
|
||||
haml (= 4.0.5)
|
||||
handlebars_assets (= 0.18.0)
|
||||
http_accept_language (= 2.0.2)
|
||||
i18n-inflector-rails (= 1.0.7)
|
||||
jasmine (= 2.0.3)
|
||||
jasmine (= 2.1.0)
|
||||
jasmine-jquery-rails (= 2.0.3)
|
||||
jquery-rails (= 3.1.2)
|
||||
js-routes (= 0.9.9)
|
||||
|
|
@ -610,9 +641,9 @@ DEPENDENCIES
|
|||
json (= 1.8.1)
|
||||
markerb (= 1.0.2)
|
||||
messagebus_ruby_api (= 1.0.3)
|
||||
mini_magick (= 3.8.1)
|
||||
mini_magick (= 4.0.1)
|
||||
mobile-fu (= 1.3.1)
|
||||
mysql2 (= 0.3.16)
|
||||
mysql2 (= 0.3.17)
|
||||
nokogiri (= 1.6.4.1)
|
||||
omniauth (= 1.2.2)
|
||||
omniauth-facebook (= 1.6.0)
|
||||
|
|
@ -629,7 +660,7 @@ DEPENDENCIES
|
|||
rack-protection (= 1.2)
|
||||
rack-rewrite (= 1.5.0)
|
||||
rack-ssl (= 1.4.1)
|
||||
rails (= 4.1.7)
|
||||
rails (= 4.1.8)
|
||||
rails-assets-diaspora_jsxc (~> 0.0.8)
|
||||
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)
|
||||
rails-assets-jquery (= 1.11.1)
|
||||
|
|
@ -651,7 +682,7 @@ DEPENDENCIES
|
|||
ruby-oembed (= 0.8.11)
|
||||
sass-rails (= 4.0.4)
|
||||
selenium-webdriver (= 2.44.0)
|
||||
sidekiq (= 3.2.6)
|
||||
sidekiq (= 3.3.0)
|
||||
sidetiq (= 0.6.3)
|
||||
simple_captcha2 (= 0.3.2)
|
||||
sinatra (= 1.3.3)
|
||||
|
|
|
|||
Loading…
Reference in a new issue