Browse Source

rails and dep update

pull/1/head
Claudius Nicolae 12 years ago
parent
commit
2e1a12daa6
  1. 5
      Gemfile
  2. 143
      Gemfile.lock

5
Gemfile

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.12' gem 'rails', '3.2.13'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
@ -45,8 +45,7 @@ group :assets do
gem 'font-awesome-sass-rails', '~> 3.0.0' gem 'font-awesome-sass-rails', '~> 3.0.0'
gem 'webshims-rails', '~> 0.4.7' gem 'webshims-rails', '~> 0.4.7'
gem 'detect_timezone_rails', '~> 0.0.3' gem 'detect_timezone_rails', '~> 0.0.3'
gem 'jquery-cookie-rails', '~> 1.2.0', gem 'jquery-cookie-rails', '~> 1.3.1'
git: 'git://github.com/RyanScottLewis/jquery-cookie-rails.git'
gem 'coffee-rails', "~> 3.2.1" gem 'coffee-rails', "~> 3.2.1"
gem 'uglifier', '>= 1.0.3' gem 'uglifier', '>= 1.0.3'
gem 'oily_png', '1.0.2' gem 'oily_png', '1.0.2'

143
Gemfile.lock

@ -1,12 +1,3 @@
GIT
remote: git://github.com/RyanScottLewis/jquery-cookie-rails.git
revision: f35da80d8ff720f7164924cc40abd2688f834ca6
specs:
jquery-cookie-rails (1.2.0)
jquery-rails (~> 2.0)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
GIT GIT
remote: https://github.com/KimNorgaard/validates_hostname.git remote: https://github.com/KimNorgaard/validates_hostname.git
revision: 6421e9bd8261a2fe010c627191a0dbe30352469f revision: 6421e9bd8261a2fe010c627191a0dbe30352469f
@ -30,12 +21,12 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.12) actionmailer (3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
mail (~> 2.4.4) mail (~> 2.5.3)
actionpack (3.2.12) actionpack (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -46,21 +37,21 @@ GEM
active-model-email-validator (1.0.2) active-model-email-validator (1.0.2)
activemodel activemodel
mail mail
active_scaffold (3.2.19) active_scaffold (3.2.20)
rails (>= 3.1.3) rails (>= 3.1.3)
activemodel (3.2.12) activemodel (3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.12) activerecord (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.12) activeresource (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
activesupport (3.2.12) activesupport (3.2.13)
i18n (~> 0.6) i18n (= 0.6.1)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_nested_interval (0.0.10) acts_as_nested_interval (0.0.10)
rails (~> 3.2.1) rails (~> 3.2.1)
@ -91,7 +82,7 @@ GEM
xpath (~> 0.1.4) xpath (~> 0.1.4)
childprocess (0.3.9) childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.7) chunky_png (1.2.8)
coderay (1.0.9) coderay (1.0.9)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
@ -99,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.1) coffee-script-source (1.6.2)
compass (0.12.2) compass (0.12.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
@ -136,25 +127,31 @@ GEM
font-awesome-sass-rails (3.0.2.2) font-awesome-sass-rails (3.0.2.2)
railties (>= 3.1.1) railties (>= 3.1.1)
sass-rails (>= 3.1.1) sass-rails (>= 3.1.1)
formatador (0.2.4)
fssm (0.2.10) fssm (0.2.10)
gem_plugin (0.2.3) gem_plugin (0.2.3)
guard (1.6.2) guard (1.7.0)
formatador (>= 0.2.4)
listen (>= 0.6.0) listen (>= 0.6.0)
lumberjack (>= 1.0.2) lumberjack (>= 1.0.2)
pry (>= 0.9.10) pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6) thor (>= 0.14.6)
guard-rspec (0.6.0) guard-rspec (0.6.0)
guard (>= 0.10.0) guard (>= 0.10.0)
guard-spork (0.5.2) guard-spork (0.5.2)
guard (>= 0.10.0) guard (>= 0.10.0)
spork (>= 0.8.4) spork (>= 0.8.4)
haml (4.0.0) haml (4.0.2)
tilt tilt
highline (1.6.15) highline (1.6.18)
hike (1.2.1) hike (1.2.2)
i18n (0.6.4) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-cookie-rails (1.3.1)
jquery-rails (~> 2.0)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
version (~> 1.0)
jquery-rails (2.1.4) jquery-rails (2.1.4)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
@ -168,10 +165,10 @@ GEM
kgio (2.8.0) kgio (2.8.0)
libnotify (0.7.4) libnotify (0.7.4)
ffi (~> 1.0.11) ffi (~> 1.0.11)
libv8 (3.11.8.13) libv8 (3.11.8.17)
listen (0.7.3) listen (0.7.3)
lumberjack (1.0.2) lumberjack (1.0.3)
mail (2.4.4) mail (2.5.3)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
@ -180,39 +177,39 @@ GEM
rack-contrib rack-contrib
rails rails
method_source (0.8.1) method_source (0.8.1)
mime-types (1.21) mime-types (1.23)
mongrel (1.2.0.pre2) mongrel (1.2.0.pre2)
daemons (~> 1.0.10) daemons (~> 1.0.10)
gem_plugin (~> 0.2.3) gem_plugin (~> 0.2.3)
multi_json (1.6.1) multi_json (1.7.2)
mysql2 (0.3.11) mysql2 (0.3.11)
nested_form (0.3.1) nested_form (0.3.2)
net-scp (1.1.0) net-scp (1.1.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-sftp (2.1.1) net-sftp (2.1.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.6.6) net-ssh (2.6.7)
net-ssh-gateway (1.2.0) net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
nilify_blanks (1.0.0) nilify_blanks (1.0.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
nokogiri (1.5.6) nokogiri (1.5.9)
oily_png (1.0.2) oily_png (1.0.2)
chunky_png (~> 1.2.1) chunky_png (~> 1.2.1)
options (2.3.0) options (2.3.0)
fattr fattr
orm_adapter (0.4.0) orm_adapter (0.4.0)
parallel (0.6.2) parallel (0.6.4)
parallel_tests (0.10.0) parallel_tests (0.10.0)
parallel parallel
polyamorous (0.5.0) polyamorous (0.5.0)
activerecord (~> 3.0) activerecord (~> 3.0)
polyglot (0.3.3) polyglot (0.3.3)
progress_bar (0.4.0) progress_bar (1.0.0)
highline (~> 1.6.1) highline (~> 1.6.1)
options (~> 2.3.0) options (~> 2.3.0)
pry (0.9.12) pry (0.9.12.1)
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.4) slop (~> 3.4)
@ -230,21 +227,21 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.12) rails (3.2.13)
actionmailer (= 3.2.12) actionmailer (= 3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
activerecord (= 3.2.12) activerecord (= 3.2.13)
activeresource (= 3.2.12) activeresource (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.12) railties (= 3.2.13)
rails-backbone (0.7.2) rails-backbone (0.7.2)
coffee-script (~> 2.2.0) coffee-script (~> 2.2.0)
ejs (~> 1.0.0) ejs (~> 1.0.0)
railties (>= 3.1.0) railties (>= 3.1.0)
rails-settings-cached (0.2.4) rails-settings-cached (0.2.4)
rails (>= 3.0.0) rails (>= 3.0.0)
rails_admin (0.4.5) rails_admin (0.4.7)
bootstrap-sass (~> 2.2) bootstrap-sass (~> 2.2)
builder (~> 3.0) builder (~> 3.0)
coffee-rails (~> 3.1) coffee-rails (~> 3.1)
@ -261,20 +258,20 @@ GEM
sass-rails (~> 3.1) sass-rails (~> 3.1)
rails_config (0.2.7) rails_config (0.2.7)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (3.2.12) railties (3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.10.0) raindrops (0.11.0)
rake (10.0.3) rake (10.0.4)
rb-inotify (0.8.8) rb-inotify (0.8.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
ref (1.0.2) ref (1.0.4)
remotipart (1.0.5) remotipart (1.0.5)
rspec (2.10.0) rspec (2.10.0)
rspec-core (~> 2.10.0) rspec-core (~> 2.10.0)
@ -295,14 +292,14 @@ GEM
ruby_parser (2.3.1) ruby_parser (2.3.1)
sexp_processor (~> 3.0) sexp_processor (~> 3.0)
rubyzip (0.9.9) rubyzip (0.9.9)
safe_yaml (0.8.4) safe_yaml (0.9.1)
sass (3.2.6) sass (3.2.7)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
seedbank (0.1.3) seedbank (0.1.3)
selenium-webdriver (2.31.0) selenium-webdriver (2.32.1)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
@ -317,8 +314,8 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
simplecov-html (0.7.1) simplecov-html (0.7.1)
slop (3.4.3) slop (3.4.4)
sourcify (0.6.0.rc3) sourcify (0.6.0.rc4)
file-tail (~> 1.0.10) file-tail (~> 1.0.10)
ruby2ruby (~> 1.3.1) ruby2ruby (~> 1.3.1)
ruby_parser (~> 2.3.1) ruby_parser (~> 2.3.1)
@ -329,18 +326,17 @@ GEM
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)
squeel (1.0.17) squeel (1.0.18)
activerecord (~> 3.0) activerecord (~> 3.0)
activesupport (~> 3.0) activesupport (~> 3.0)
polyamorous (~> 0.5.0) polyamorous (~> 0.5.0)
switch_user (0.6.0) switch_user (0.6.0)
terminal-table (1.4.5)
therubyracer (0.11.4) therubyracer (0.11.4)
libv8 (~> 3.11.8.12) libv8 (~> 3.11.8.12)
ref ref
thor (0.17.0) thor (0.18.1)
tilt (1.3.4) tilt (1.3.7)
tins (0.7.1) tins (0.7.2)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
@ -349,14 +345,15 @@ GEM
sprockets (>= 2.0.0) sprockets (>= 2.0.0)
turbolinks (1.0.0) turbolinks (1.0.0)
coffee-rails coffee-rails
tzinfo (0.3.36) tzinfo (0.3.37)
uglifier (1.3.0) uglifier (2.0.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.5.0) unicorn (4.5.0)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
version (1.0.0)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webshims-rails (0.4.7) webshims-rails (0.4.7)
@ -390,7 +387,7 @@ DEPENDENCIES
font-awesome-sass-rails (~> 3.0.0) font-awesome-sass-rails (~> 3.0.0)
guard-rspec (~> 0.6.0) guard-rspec (~> 0.6.0)
guard-spork (~> 0.5.1) guard-spork (~> 0.5.1)
jquery-cookie-rails (~> 1.2.0)! jquery-cookie-rails (~> 1.3.1)
jquery-rails (~> 2.1.3) jquery-rails (~> 2.1.3)
libnotify (~> 0.7.2) libnotify (~> 0.7.2)
mail_form (~> 1.3.0) mail_form (~> 1.3.0)
@ -403,7 +400,7 @@ DEPENDENCIES
parallel_tests (= 0.10.0) parallel_tests (= 0.10.0)
progress_bar progress_bar
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rails (= 3.2.12) rails (= 3.2.13)
rails-backbone (~> 0.7.0) rails-backbone (~> 0.7.0)
rails-settings-cached (~> 0.2.2) rails-settings-cached (~> 0.2.2)
rails_admin (~> 0.4.5) rails_admin (~> 0.4.5)

Loading…
Cancel
Save