Update the bundle

There's now support for Rails 4.2 in Globalize so we can update.
This commit is contained in:
Petko Bordjukov 2015-04-08 23:20:58 +03:00
parent 4078e8d953
commit df433873ed
2 changed files with 172 additions and 132 deletions

View File

@ -1,11 +1,11 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.1.8' gem 'rails', '4.2.1'
gem 'sqlite3' gem 'sqlite3'
gem 'pg' gem 'pg'
gem 'sass-rails', '~> 5.0.0.beta1' gem 'sass-rails'
gem 'uglifier' gem 'uglifier'
gem 'coffee-rails' gem 'coffee-rails'
@ -19,7 +19,7 @@ gem 'rails-i18n'
gem 'devise' gem 'devise'
gem 'devise-i18n' gem 'devise-i18n'
gem 'simple_form', '~> 3.1.0.rc2' gem 'simple_form'
# Phone validation # Phone validation
gem 'phony_rails' gem 'phony_rails'

View File

@ -8,49 +8,60 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.8) actionmailer (4.2.1)
actionpack (= 4.1.8) actionpack (= 4.2.1)
actionview (= 4.1.8) actionview (= 4.2.1)
activejob (= 4.2.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8) rails-dom-testing (~> 1.0, >= 1.0.5)
actionview (= 4.1.8) actionpack (4.2.1)
activesupport (= 4.1.8) actionview (= 4.2.1)
rack (~> 1.5.2) activesupport (= 4.2.1)
rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.8) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.8) rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.8) rails-dom-testing (~> 1.0, >= 1.0.5)
activesupport (= 4.1.8) rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.8) activerecord (4.2.1)
activemodel (= 4.1.8) activemodel (= 4.2.1)
activesupport (= 4.1.8) activesupport (= 4.2.1)
arel (~> 5.0.0) arel (~> 6.0)
activesupport (4.1.8) activesupport (4.2.1)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.1) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (5.0.1.20140414130214) arel (6.0.0)
autoprefixer-rails (4.0.1) autoprefixer-rails (5.1.8)
execjs execjs
awesome_print (1.2.0) json
bcrypt (3.1.9) awesome_print (1.6.1)
bootstrap-sass (3.3.1.0) bcrypt (3.1.10)
sass (~> 3.2) bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
bootstrap-sass-extras (0.0.6) bootstrap-sass-extras (0.0.6)
rails (>= 3.1.0) rails (>= 3.1.0)
bootswatch-rails (3.2.4) bootswatch-rails (3.2.4)
railties (>= 3.1) railties (>= 3.1)
builder (3.2.2) builder (3.2.2)
capistrano (3.2.1) capistrano (3.4.0)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano-bundler (1.1.3) capistrano-bundler (1.1.4)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-rails (1.1.2) capistrano-rails (1.1.2)
@ -72,18 +83,19 @@ GEM
mime-types (>= 1.16) mime-types (>= 1.16)
celluloid (0.16.0) celluloid (0.16.0)
timers (~> 4.0.0) timers (~> 4.0.0)
choice (0.1.6) choice (0.1.7)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.1.0) coffee-rails (4.1.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.9.1)
colorize (0.7.3) colorize (0.7.5)
countries (0.9.3) countries (0.11.3)
currencies (~> 0.4.2) currencies (~> 0.4.2)
i18n_data (~> 0.6.0)
currencies (0.4.2) currencies (0.4.2)
devise (3.4.1) devise (3.4.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
@ -92,11 +104,11 @@ GEM
responders responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (0.11.2) devise-i18n (0.12.0)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
erubis (2.7.0) erubis (2.7.0)
execjs (2.2.2) execjs (2.5.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.5.0)
@ -104,179 +116,207 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
faker (1.4.3) faker (1.4.3)
i18n (~> 0.5) i18n (~> 0.5)
ffi (1.9.6) ffi (1.9.8)
font-awesome-rails (4.2.0.0) font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
formatador (0.2.5) formatador (0.2.5)
globalize (4.0.2) globalid (0.3.5)
activemodel (>= 4.0.0, < 5) activesupport (>= 4.1.0)
activerecord (>= 4.0.0, < 5) globalize (5.0.1)
guard (2.8.2) activemodel (>= 4.2.0, < 4.3)
activerecord (>= 4.2.0, < 4.3)
guard (2.12.5)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (~> 2.7) listen (~> 2.7)
lumberjack (~> 1.0) lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12) pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1) thor (>= 0.18.1)
guard-rspec (4.3.1) guard-compat (1.2.1)
guard-rspec (4.5.0)
guard (~> 2.1) guard (~> 2.1)
rspec (>= 2.14, < 4.0) guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hike (1.2.3) hike (1.2.3)
hirb (0.7.2) hirb (0.7.3)
hitimes (1.2.2) hitimes (1.2.2)
i18n (0.6.11) i18n (0.7.0)
jquery-datatables-rails (3.1.0) i18n_data (0.6.3)
jquery-datatables-rails (3.2.0)
actionpack (>= 3.1) actionpack (>= 3.1)
jquery-rails jquery-rails
railties (>= 3.1) railties (>= 3.1)
sass-rails sass-rails
jquery-rails (3.1.2) jquery-rails (4.0.3)
railties (>= 3.0, < 5.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.2)
libv8 (3.16.14.7) libv8 (3.16.14.7)
listen (2.8.0) listen (2.10.0)
celluloid (>= 0.15.2) celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
loofah (2.0.1)
nokogiri (>= 1.5.9)
lumberjack (1.0.9) lumberjack (1.0.9)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.1) mini_portile (0.6.2)
minitest (5.4.3) minitest (5.5.1)
morrisjs-rails (0.5.1) morrisjs-rails (0.5.1)
railties (> 3.1, < 5) railties (> 3.1, < 5)
multi_json (1.10.1) multi_json (1.11.0)
nenv (0.2.0)
nested_form (0.3.2) nested_form (0.3.2)
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.1) net-ssh (2.9.2)
nokogiri (1.6.4.1) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
notiffany (0.0.6)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.17.1) pg (0.18.1)
phony (2.7.1) phony (2.12.9)
phony_rails (0.8.0) phony_rails (0.12.4)
activesupport (>= 3.0) activesupport (>= 3.0)
countries (>= 0.8.2) countries (~> 0.8, >= 0.8.2)
phony (~> 2.7.1) phony (~> 2.12)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pry-rails (0.3.2) pry-rails (0.3.4)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (2.9.2) puma (2.11.1)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
rack (1.5.2) rack (1.6.0)
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.8) rails (4.2.1)
actionmailer (= 4.1.8) actionmailer (= 4.2.1)
actionpack (= 4.1.8) actionpack (= 4.2.1)
actionview (= 4.1.8) actionview (= 4.2.1)
activemodel (= 4.1.8) activejob (= 4.2.1)
activerecord (= 4.1.8) activemodel (= 4.2.1)
activesupport (= 4.1.8) activerecord (= 4.2.1)
activesupport (= 4.2.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8) railties (= 4.2.1)
sprockets-rails (~> 2.0) sprockets-rails
rails-erd (1.1.0) rails-deprecated_sanitizer (1.0.3)
activerecord (>= 3.0) activesupport (>= 4.2.0.alpha)
activesupport (>= 3.0) rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.3.1)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.1.6) choice (~> 0.1.6)
ruby-graphviz (~> 1.0.4) ruby-graphviz (~> 1.0.4)
rails-i18n (4.0.3) rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails-i18n (4.0.4)
i18n (~> 0.6) i18n (~> 0.6)
railties (~> 4.0) railties (~> 4.0)
railties (4.1.8) railties (4.2.1)
actionpack (= 4.1.8) actionpack (= 4.2.1)
activesupport (= 4.1.8) activesupport (= 4.2.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.4.2)
raphael-rails (2.1.2) raphael-rails (2.1.2)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
ref (1.0.5) ref (1.0.5)
responders (1.1.2) responders (2.1.0)
railties (>= 3.2, < 4.2) railties (>= 4.2.0, < 5)
rmagick (2.13.3) rmagick (2.14.0)
rspec (3.1.0) rspec (3.2.0)
rspec-core (~> 3.1.0) rspec-core (~> 3.2.0)
rspec-expectations (~> 3.1.0) rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.1.0) rspec-mocks (~> 3.2.0)
rspec-core (3.1.7) rspec-core (3.2.3)
rspec-support (~> 3.1.0) rspec-support (~> 3.2.0)
rspec-expectations (3.1.2) rspec-expectations (3.2.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0) rspec-support (~> 3.2.0)
rspec-mocks (3.1.3) rspec-mocks (3.2.1)
rspec-support (~> 3.1.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-rails (3.1.0) rspec-support (~> 3.2.0)
actionpack (>= 3.0) rspec-rails (3.2.1)
activesupport (>= 3.0) actionpack (>= 3.0, < 4.3)
railties (>= 3.0) activesupport (>= 3.0, < 4.3)
rspec-core (~> 3.1.0) railties (>= 3.0, < 4.3)
rspec-expectations (~> 3.1.0) rspec-core (~> 3.2.0)
rspec-mocks (~> 3.1.0) rspec-expectations (~> 3.2.0)
rspec-support (~> 3.1.0) rspec-mocks (~> 3.2.0)
rspec-support (3.1.2) rspec-support (~> 3.2.0)
rspec-support (3.2.2)
ruby-graphviz (1.0.9) ruby-graphviz (1.0.9)
sass (3.4.8) sass (3.4.13)
sass-rails (5.0.0.beta1) sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2) sass (~> 3.1)
sprockets (~> 2.12) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
simple_form (3.1.0.rc2) tilt (~> 1.1)
shellany (0.0.1)
simple_form (3.1.0)
actionpack (~> 4.0) actionpack (~> 4.0)
activemodel (~> 4.0) activemodel (~> 4.0)
simplecov (0.9.1) simplecov (0.9.2)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.9.0)
simplecov-html (0.8.0) simplecov-html (0.9.0)
slim (2.1.0) slim (3.0.3)
temple (~> 0.6.9) temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slim-rails (2.1.5) slim-rails (3.0.1)
actionpack (>= 3.0, < 4.2) actionmailer (>= 3.1, < 5.0)
activesupport (>= 3.0, < 4.2) actionpack (>= 3.1, < 5.0)
railties (>= 3.0, < 4.2) activesupport (>= 3.1, < 5.0)
slim (~> 2.0) railties (>= 3.1, < 5.0)
slim (~> 3.0)
slop (3.6.0) slop (3.6.0)
spring (1.2.0) spring (1.3.4)
spring-commands-rspec (1.0.2) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (2.12.3) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0) sprockets-rails (2.2.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10) sqlite3 (1.3.10)
sshkit (1.5.1) sshkit (1.7.1)
colorize colorize (>= 0.7.0)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
temple (0.6.10) temple (0.7.5)
therubyracer (0.12.1) therubyracer (0.12.2)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timers (4.0.1) timers (4.0.1)
hitimes hitimes
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.7.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
warden (1.2.3) warden (1.2.3)
@ -315,14 +355,14 @@ DEPENDENCIES
phony_rails phony_rails
pry-rails pry-rails
puma puma
rails (= 4.1.8) rails (= 4.2.1)
rails-erd rails-erd
rails-i18n rails-i18n
raphael-rails raphael-rails
rmagick rmagick
rspec-rails rspec-rails
sass-rails (~> 5.0.0.beta1) sass-rails
simple_form (~> 3.1.0.rc2) simple_form
simplecov simplecov
slim-rails slim-rails
spring spring