Browse Source

update deps

pull/1/head
Nicolae Claudius 11 years ago
parent
commit
a42e46acb1
  1. 10
      Gemfile
  2. 40
      Gemfile.lock

10
Gemfile

@ -42,7 +42,7 @@ gem 'seedbank', '~> 0.3.0'
gem 'unicorn', '~> 4.6.3' gem 'unicorn', '~> 4.6.3'
gem 'dalli', '~> 2.7.0' gem 'dalli', '~> 2.7.0'
gem 'json', '~> 1.8.0' gem 'json', '~> 1.8.0'
gem 'rails_admin', '~> 0.6.0' gem 'rails_admin', '~> 0.6.1'
# Assets # Assets
gem 'uglifier', '~> 2.4.0' gem 'uglifier', '~> 2.4.0'
@ -50,16 +50,16 @@ gem 'oily_png', '~> 1.1.0'
gem 'therubyracer', '~> 0.12.0' gem 'therubyracer', '~> 0.12.0'
gem 'sass-rails', '~> 4.0.0' gem 'sass-rails', '~> 4.0.0'
gem 'compass-rails', '~> 1.1.0' gem 'compass-rails', '~> 1.1.0'
gem 'bootstrap-sass', '~> 3.0.3.0' gem 'bootstrap-sass', '~> 3.1.0.1'
gem 'font-awesome-rails', '~> 4.0.3.1' gem 'font-awesome-rails', '~> 4.0.3.1'
gem 'webshims-rails', '~> 1.12.0' gem 'webshims-rails', '~> 1.12.2'
gem 'detect_timezone_rails', '~> 0.0.3' gem 'detect_timezone_rails', '~> 0.0.3'
gem 'nprogress-rails', '~> 0.1.2.2' gem 'nprogress-rails', '~> 0.1.2.2'
gem 'animate-rails', '~> 1.0.0' gem 'animate-rails', '~> 1.0.0'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails', '~> 3.0.4' gem 'jquery-rails', '~> 3.1.0'
gem 'jquery-ui-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 4.1.0'
gem 'turbolinks', '~> 2.2.0' gem 'turbolinks', '~> 2.2.1'
group :development do group :development do
gem 'quiet_assets', '~> 1.0.1' gem 'quiet_assets', '~> 1.0.1'

40
Gemfile.lock

@ -69,7 +69,7 @@ GEM
erubis (>= 2.6.6) erubis (>= 2.6.6)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bootstrap-sass (3.0.3.0) bootstrap-sass (3.1.0.1)
sass (~> 3.2) sass (~> 3.2)
builder (3.1.4) builder (3.1.4)
bullet (4.7.1) bullet (4.7.1)
@ -90,7 +90,7 @@ GEM
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.6.3) coffee-script-source (1.7.0)
compass (0.12.2) compass (0.12.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
@ -132,7 +132,7 @@ GEM
hashie (2.0.5) hashie (2.0.5)
hike (1.2.3) hike (1.2.3)
i18n (0.6.9) i18n (0.6.9)
jquery-rails (3.0.4) jquery-rails (3.1.0)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (4.1.1) jquery-ui-rails (4.1.1)
@ -143,7 +143,7 @@ GEM
kaminari (0.15.1) kaminari (0.15.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.8.1) kgio (2.9.0)
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
letter_opener (1.2.0) letter_opener (1.2.0)
@ -161,7 +161,7 @@ GEM
multi_json (1.8.4) multi_json (1.8.4)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.3.14) mysql2 (0.3.15)
nested_form (0.3.2) nested_form (0.3.2)
nilify_blanks (1.0.3) nilify_blanks (1.0.3)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
@ -213,7 +213,7 @@ GEM
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
rails-settings-cached (0.3.2) rails-settings-cached (0.3.2)
rails (>= 4.0.0) rails (>= 4.0.0)
rails_admin (0.6.0) rails_admin (0.6.1)
builder (~> 3.1) builder (~> 3.1)
coffee-rails (~> 4.0) coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0) font-awesome-rails (>= 3.0)
@ -223,9 +223,9 @@ GEM
kaminari (~> 0.14) kaminari (~> 0.14)
nested_form (~> 0.3) nested_form (~> 0.3)
rack-pjax (~> 0.7) rack-pjax (~> 0.7)
rails (~> 4.0.0) rails (~> 4.0)
remotipart (~> 1.0) remotipart (~> 1.0)
safe_yaml (~> 0.9) safe_yaml (~> 1.0)
sass-rails (~> 4.0) sass-rails (~> 4.0)
rails_config (0.3.3) rails_config (0.3.3)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -239,9 +239,9 @@ GEM
ref (1.0.5) ref (1.0.5)
remotipart (1.2.1) remotipart (1.2.1)
rspec-core (2.14.7) rspec-core (2.14.7)
rspec-expectations (2.14.4) rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4) rspec-mocks (2.14.5)
rspec-rails (2.14.1) rspec-rails (2.14.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activemodel (>= 3.0) activemodel (>= 3.0)
@ -250,8 +250,8 @@ GEM
rspec-core (~> 2.14.0) rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0) rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0) rspec-mocks (~> 2.14.0)
safe_yaml (0.9.7) safe_yaml (1.0.1)
sass (3.2.13) sass (3.2.14)
sass-rails (4.0.1) sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (>= 3.1.10)
@ -276,7 +276,7 @@ GEM
activesupport (>= 3.0) activesupport (>= 3.0)
polyamorous (~> 0.6.0) polyamorous (~> 0.6.0)
switch_user (0.9.4) switch_user (0.9.4)
therubyracer (0.12.0) therubyracer (0.12.1)
libv8 (~> 3.16.14.0) libv8 (~> 3.16.14.0)
ref ref
thor (0.18.1) thor (0.18.1)
@ -286,7 +286,7 @@ GEM
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (2.2.0) turbolinks (2.2.1)
coffee-rails coffee-rails
tzinfo (0.3.38) tzinfo (0.3.38)
uglifier (2.4.0) uglifier (2.4.0)
@ -299,7 +299,7 @@ GEM
uniform_notifier (1.4.0) uniform_notifier (1.4.0)
warden (1.2.3) warden (1.2.3)
rack (>= 1.0) rack (>= 1.0)
webshims-rails (1.12.0) webshims-rails (1.12.2)
rails (> 3.1.0) rails (> 3.1.0)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -314,7 +314,7 @@ DEPENDENCIES
animate-rails (~> 1.0.0) animate-rails (~> 1.0.0)
better_errors (= 1.1.0) better_errors (= 1.1.0)
binding_of_caller (= 0.7.2) binding_of_caller (= 0.7.2)
bootstrap-sass (~> 3.0.3.0) bootstrap-sass (~> 3.1.0.1)
bullet (~> 4.7.1) bullet (~> 4.7.1)
cancan (= 1.6.7) cancan (= 1.6.7)
capybara (~> 2.2.0) capybara (~> 2.2.0)
@ -329,7 +329,7 @@ DEPENDENCIES
factory_girl_rails (~> 4.3.0) factory_girl_rails (~> 4.3.0)
faker (~> 1.2.0) faker (~> 1.2.0)
font-awesome-rails (~> 4.0.3.1) font-awesome-rails (~> 4.0.3.1)
jquery-rails (~> 3.0.4) jquery-rails (~> 3.1.0)
jquery-ui-rails (~> 4.1.0) jquery-ui-rails (~> 4.1.0)
json (~> 1.8.0) json (~> 1.8.0)
letter_opener (~> 1.2.0) letter_opener (~> 1.2.0)
@ -345,7 +345,7 @@ DEPENDENCIES
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rails (= 4.0.2) rails (= 4.0.2)
rails-settings-cached (~> 0.3.1) rails-settings-cached (~> 0.3.1)
rails_admin (~> 0.6.0) rails_admin (~> 0.6.1)
rails_config (~> 0.3.3) rails_config (~> 0.3.3)
rspec-rails (~> 2.14.0) rspec-rails (~> 2.14.0)
sass-rails (~> 4.0.0) sass-rails (~> 4.0.0)
@ -355,9 +355,9 @@ DEPENDENCIES
squeel (~> 1.1.0) squeel (~> 1.1.0)
switch_user (~> 0.9.3) switch_user (~> 0.9.3)
therubyracer (~> 0.12.0) therubyracer (~> 0.12.0)
turbolinks (~> 2.2.0) turbolinks (~> 2.2.1)
uglifier (~> 2.4.0) uglifier (~> 2.4.0)
unicorn (~> 4.6.3) unicorn (~> 4.6.3)
userstamp (~> 2.0.2)! userstamp (~> 2.0.2)!
validates_hostname (~> 1.0.0)! validates_hostname (~> 1.0.0)!
webshims-rails (~> 1.12.0) webshims-rails (~> 1.12.2)

Loading…
Cancel
Save