update gems
This commit is contained in:
parent
39c79287e2
commit
b68fe360d7
2
Gemfile
2
Gemfile
|
@ -1,7 +1,7 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
source 'https://rails-assets.org'
|
source 'https://rails-assets.org'
|
||||||
|
|
||||||
gem 'rails', '4.2.2'
|
gem 'rails', '~> 4.2.0'
|
||||||
gem 'rails-i18n'
|
gem 'rails-i18n'
|
||||||
gem 'i18n-js', '= 3.0.0.rc10'
|
gem 'i18n-js', '= 3.0.0.rc10'
|
||||||
|
|
||||||
|
|
138
Gemfile.lock
138
Gemfile.lock
|
@ -9,36 +9,36 @@ GEM
|
||||||
remote: https://rails-assets.org/
|
remote: https://rails-assets.org/
|
||||||
specs:
|
specs:
|
||||||
CFPropertyList (2.3.2)
|
CFPropertyList (2.3.2)
|
||||||
actionmailer (4.2.2)
|
actionmailer (4.2.5.1)
|
||||||
actionpack (= 4.2.2)
|
actionpack (= 4.2.5.1)
|
||||||
actionview (= 4.2.2)
|
actionview (= 4.2.5.1)
|
||||||
activejob (= 4.2.2)
|
activejob (= 4.2.5.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
actionpack (4.2.2)
|
actionpack (4.2.5.1)
|
||||||
actionview (= 4.2.2)
|
actionview (= 4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
rack (~> 1.6)
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.2)
|
actionview (4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.2)
|
activejob (4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.2)
|
activemodel (4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.2)
|
activerecord (4.2.5.1)
|
||||||
activemodel (= 4.2.2)
|
activemodel (= 4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.2)
|
activesupport (4.2.5.1)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -60,7 +60,7 @@ GEM
|
||||||
bootstrap_form (2.3.0)
|
bootstrap_form (2.3.0)
|
||||||
bootswatch-rails (3.3.5)
|
bootswatch-rails (3.3.5)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
brakeman (3.1.4)
|
brakeman (3.1.5)
|
||||||
erubis (~> 2.6)
|
erubis (~> 2.6)
|
||||||
fastercsv (~> 1.5)
|
fastercsv (~> 1.5)
|
||||||
haml (>= 3.0, < 5.0)
|
haml (>= 3.0, < 5.0)
|
||||||
|
@ -74,8 +74,9 @@ GEM
|
||||||
terminal-table (~> 1.4)
|
terminal-table (~> 1.4)
|
||||||
buftok (0.2.0)
|
buftok (0.2.0)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
byebug (8.2.1)
|
byebug (8.2.2)
|
||||||
capybara (2.5.0)
|
capybara (2.6.2)
|
||||||
|
addressable
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
|
@ -102,7 +103,7 @@ GEM
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
delayed_paperclip (2.9.1)
|
delayed_paperclip (2.9.1)
|
||||||
paperclip (>= 3.3)
|
paperclip (>= 3.3)
|
||||||
devise (3.5.3)
|
devise (3.5.6)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
|
@ -114,16 +115,16 @@ GEM
|
||||||
devise-i18n (0.12.1)
|
devise-i18n (0.12.1)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
domain_name (0.5.25)
|
domain_name (0.5.20160128)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
equalizer (0.0.10)
|
equalizer (0.0.10)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.8)
|
eventmachine (1.0.9.1)
|
||||||
excon (0.45.4)
|
excon (0.45.4)
|
||||||
execjs (2.6.0)
|
execjs (2.6.0)
|
||||||
factory_girl (4.5.0)
|
factory_girl (4.5.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.5.0)
|
factory_girl_rails (4.6.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.5.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
fake_email_validator (1.0.11)
|
fake_email_validator (1.0.11)
|
||||||
|
@ -173,7 +174,7 @@ GEM
|
||||||
fog-atmos (0.1.0)
|
fog-atmos (0.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-aws (0.8.0)
|
fog-aws (0.8.1)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
|
@ -210,7 +211,7 @@ GEM
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
nokogiri
|
nokogiri
|
||||||
fog-radosgw (0.0.4)
|
fog-radosgw (0.0.5)
|
||||||
fog-core (>= 1.21.0)
|
fog-core (>= 1.21.0)
|
||||||
fog-json
|
fog-json
|
||||||
fog-xml (>= 0.0.1)
|
fog-xml (>= 0.0.1)
|
||||||
|
@ -224,7 +225,7 @@ GEM
|
||||||
fog-serverlove (0.1.2)
|
fog-serverlove (0.1.2)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-softlayer (1.0.2)
|
fog-softlayer (1.0.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-json
|
fog-json
|
||||||
fog-storm_on_demand (0.1.1)
|
fog-storm_on_demand (0.1.1)
|
||||||
|
@ -239,10 +240,10 @@ GEM
|
||||||
fog-voxel (0.1.0)
|
fog-voxel (0.1.0)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-vsphere (0.4.0)
|
fog-vsphere (0.6.0)
|
||||||
fog-core
|
fog-core
|
||||||
rbvmomi (~> 1.8)
|
rbvmomi (~> 1.8)
|
||||||
fog-xenserver (0.2.2)
|
fog-xenserver (0.2.3)
|
||||||
fog-core
|
fog-core
|
||||||
fog-xml
|
fog-xml
|
||||||
fog-xml (0.1.2)
|
fog-xml (0.1.2)
|
||||||
|
@ -274,7 +275,7 @@ GEM
|
||||||
hashie (3.4.3)
|
hashie (3.4.3)
|
||||||
highline (1.7.8)
|
highline (1.7.8)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
http (0.9.8)
|
http (1.0.2)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
http-cookie (~> 1.0)
|
http-cookie (~> 1.0)
|
||||||
http-form_data (~> 1.0.1)
|
http-form_data (~> 1.0.1)
|
||||||
|
@ -294,10 +295,10 @@ GEM
|
||||||
jbuilder (2.2.16)
|
jbuilder (2.2.16)
|
||||||
activesupport (>= 3.0.0, < 5)
|
activesupport (>= 3.0.0, < 5)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
jquery-minicolors-rails (2.1.4.0)
|
jquery-minicolors-rails (2.2.2.0)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
rails (>= 3.2.8)
|
rails (>= 3.2.8)
|
||||||
jquery-rails (4.0.5)
|
jquery-rails (4.1.0)
|
||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (~> 1.0)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
|
@ -329,8 +330,8 @@ GEM
|
||||||
mime-types (2.99)
|
mime-types (2.99)
|
||||||
mimemagic (0.3.0)
|
mimemagic (0.3.0)
|
||||||
mini_portile2 (2.0.0)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.8.3)
|
minitest (5.8.4)
|
||||||
momentjs-rails (2.10.6)
|
momentjs-rails (2.11.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
|
@ -338,7 +339,7 @@ GEM
|
||||||
naught (1.1.0)
|
naught (1.1.0)
|
||||||
nenv (0.2.0)
|
nenv (0.2.0)
|
||||||
nested_form (0.3.2)
|
nested_form (0.3.2)
|
||||||
nokogiri (1.6.7.1)
|
nokogiri (1.6.7.2)
|
||||||
mini_portile2 (~> 2.0.0.rc2)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
nokogumbo (1.4.7)
|
nokogumbo (1.4.7)
|
||||||
nokogiri
|
nokogiri
|
||||||
|
@ -360,16 +361,16 @@ GEM
|
||||||
json (~> 1.3)
|
json (~> 1.3)
|
||||||
omniauth-oauth (~> 1.1)
|
omniauth-oauth (~> 1.1)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (4.3.2)
|
paperclip (4.3.4)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
cocaine (~> 0.5.5)
|
cocaine (~> 0.5.5)
|
||||||
mime-types
|
mime-types
|
||||||
mimemagic (= 0.3.0)
|
mimemagic (= 0.3.0)
|
||||||
pg (0.18.4)
|
pg (0.18.4)
|
||||||
pghero (1.2.0)
|
pghero (1.2.2)
|
||||||
activerecord
|
activerecord
|
||||||
poltergeist (1.8.1)
|
poltergeist (1.9.0)
|
||||||
capybara (~> 2.1)
|
capybara (~> 2.1)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
@ -386,27 +387,27 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.2)
|
rails (4.2.5.1)
|
||||||
actionmailer (= 4.2.2)
|
actionmailer (= 4.2.5.1)
|
||||||
actionpack (= 4.2.2)
|
actionpack (= 4.2.5.1)
|
||||||
actionview (= 4.2.2)
|
actionview (= 4.2.5.1)
|
||||||
activejob (= 4.2.2)
|
activejob (= 4.2.5.1)
|
||||||
activemodel (= 4.2.2)
|
activemodel (= 4.2.5.1)
|
||||||
activerecord (= 4.2.2)
|
activerecord (= 4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.2)
|
railties (= 4.2.5.1)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-assets-growl (1.3.1)
|
rails-assets-growl (1.3.1)
|
||||||
rails-assets-jquery
|
rails-assets-jquery
|
||||||
rails-assets-jquery (2.1.4)
|
rails-assets-jquery (2.2.0)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.7)
|
rails-dom-testing (1.0.7)
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.2)
|
rails-html-sanitizer (1.0.3)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails-i18n (4.0.8)
|
rails-i18n (4.0.8)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
|
@ -425,15 +426,15 @@ GEM
|
||||||
remotipart (~> 1.0)
|
remotipart (~> 1.0)
|
||||||
safe_yaml (~> 1.0)
|
safe_yaml (~> 1.0)
|
||||||
sass-rails (>= 4.0, < 6)
|
sass-rails (>= 4.0, < 6)
|
||||||
railties (4.2.2)
|
railties (4.2.5.1)
|
||||||
actionpack (= 4.2.2)
|
actionpack (= 4.2.5.1)
|
||||||
activesupport (= 4.2.2)
|
activesupport (= 4.2.5.1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.15.0)
|
raindrops (0.15.0)
|
||||||
rake (10.4.2)
|
rake (10.5.0)
|
||||||
rb-fsevent (0.9.7)
|
rb-fsevent (0.9.7)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.6)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rbvmomi (1.8.2)
|
rbvmomi (1.8.2)
|
||||||
builder
|
builder
|
||||||
|
@ -468,7 +469,7 @@ GEM
|
||||||
ruby2ruby (2.2.0)
|
ruby2ruby (2.2.0)
|
||||||
ruby_parser (~> 3.1)
|
ruby_parser (~> 3.1)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
ruby_parser (3.7.2)
|
ruby_parser (3.7.3)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sanitize (4.0.1)
|
sanitize (4.0.1)
|
||||||
|
@ -484,15 +485,14 @@ GEM
|
||||||
sdoc (0.4.1)
|
sdoc (0.4.1)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
sexp_processor (4.6.0)
|
sexp_processor (4.6.1)
|
||||||
shellany (0.0.1)
|
shellany (0.0.1)
|
||||||
sidekiq (4.0.1)
|
sidekiq (4.1.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
connection_pool (~> 2.2, >= 2.2.0)
|
connection_pool (~> 2.2, >= 2.2.0)
|
||||||
json (~> 1.0)
|
|
||||||
redis (~> 3.2, >= 3.2.1)
|
redis (~> 3.2, >= 3.2.1)
|
||||||
simple_oauth (0.3.1)
|
simple_oauth (0.3.1)
|
||||||
simplecov (0.11.1)
|
simplecov (0.11.2)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
|
@ -502,8 +502,8 @@ GEM
|
||||||
simplecov
|
simplecov
|
||||||
simplecov-rcov (0.2.3)
|
simplecov-rcov (0.2.3)
|
||||||
simplecov (>= 0.4.1)
|
simplecov (>= 0.4.1)
|
||||||
sinatra (1.4.6)
|
sinatra (1.4.7)
|
||||||
rack (~> 1.4)
|
rack (~> 1.5)
|
||||||
rack-protection (~> 1.4)
|
rack-protection (~> 1.4)
|
||||||
tilt (>= 1.3, < 3)
|
tilt (>= 1.3, < 3)
|
||||||
slim (3.0.6)
|
slim (3.0.6)
|
||||||
|
@ -545,12 +545,12 @@ GEM
|
||||||
coffee-rails
|
coffee-rails
|
||||||
twemoji-rails (1.2.1.3)
|
twemoji-rails (1.2.1.3)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
twitter (5.15.0)
|
twitter (5.16.0)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
buftok (~> 0.2.0)
|
buftok (~> 0.2.0)
|
||||||
equalizer (= 0.0.10)
|
equalizer (= 0.0.10)
|
||||||
faraday (~> 0.9.0)
|
faraday (~> 0.9.0)
|
||||||
http (>= 0.4, < 0.10)
|
http (~> 1.0)
|
||||||
http_parser.rb (~> 0.6.0)
|
http_parser.rb (~> 0.6.0)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
memoizable (~> 0.4.0)
|
memoizable (~> 0.4.0)
|
||||||
|
@ -563,14 +563,14 @@ GEM
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.7.1)
|
unf_ext (0.0.7.2)
|
||||||
unicorn (5.0.1)
|
unicorn (5.0.1)
|
||||||
kgio (~> 2.6)
|
kgio (~> 2.6)
|
||||||
rack
|
rack
|
||||||
raindrops (~> 0.7)
|
raindrops (~> 0.7)
|
||||||
warden (1.2.4)
|
warden (1.2.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
web-console (2.2.1)
|
web-console (2.3.0)
|
||||||
activemodel (>= 4.0)
|
activemodel (>= 4.0)
|
||||||
binding_of_caller (>= 0.7.2)
|
binding_of_caller (>= 0.7.2)
|
||||||
railties (>= 4.0)
|
railties (>= 4.0)
|
||||||
|
@ -631,7 +631,7 @@ DEPENDENCIES
|
||||||
pghero
|
pghero
|
||||||
poltergeist
|
poltergeist
|
||||||
questiongenerator!
|
questiongenerator!
|
||||||
rails (= 4.2.2)
|
rails (~> 4.2.0)
|
||||||
rails-assets-growl
|
rails-assets-growl
|
||||||
rails-i18n
|
rails-i18n
|
||||||
rails_admin
|
rails_admin
|
||||||
|
|
Loading…
Reference in New Issue