updated Gemfile to 3.2.11
This commit is contained in:
parent
d2383e50db
commit
c372f3dfc6
2 changed files with 43 additions and 42 deletions
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.1'
|
gem 'rails', '3.2.11'
|
||||||
|
|
||||||
# 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'
|
||||||
|
|
83
Gemfile.lock
83
Gemfile.lock
|
@ -1,31 +1,31 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.1)
|
actionmailer (3.2.11)
|
||||||
actionpack (= 3.2.1)
|
actionpack (= 3.2.11)
|
||||||
mail (~> 2.4.0)
|
mail (~> 2.4.4)
|
||||||
actionpack (3.2.1)
|
actionpack (3.2.11)
|
||||||
activemodel (= 3.2.1)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.1)
|
journey (~> 1.0.4)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.0)
|
||||||
rack-cache (~> 1.1)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.1.2)
|
sprockets (~> 2.2.1)
|
||||||
activemodel (3.2.1)
|
activemodel (3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.1)
|
activerecord (3.2.11)
|
||||||
activemodel (= 3.2.1)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
arel (~> 3.0.0)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.1)
|
activeresource (3.2.11)
|
||||||
activemodel (= 3.2.1)
|
activemodel (= 3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
activesupport (3.2.1)
|
activesupport (3.2.11)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
arel (3.0.2)
|
arel (3.0.2)
|
||||||
|
@ -35,7 +35,7 @@ GEM
|
||||||
best_in_place (2.0.2)
|
best_in_place (2.0.2)
|
||||||
jquery-rails
|
jquery-rails
|
||||||
rails (~> 3.1)
|
rails (~> 3.1)
|
||||||
builder (3.0.3)
|
builder (3.0.4)
|
||||||
cancan (1.6.7)
|
cancan (1.6.7)
|
||||||
coffee-rails (3.2.2)
|
coffee-rails (3.2.2)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
|
@ -59,41 +59,41 @@ GEM
|
||||||
jquery-rails (2.1.2)
|
jquery-rails (2.1.2)
|
||||||
railties (>= 3.1.0, < 5.0)
|
railties (>= 3.1.0, < 5.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
json (1.7.5)
|
json (1.7.6)
|
||||||
mail (2.4.4)
|
mail (2.4.4)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.19)
|
mime-types (1.19)
|
||||||
multi_json (1.3.6)
|
multi_json (1.5.0)
|
||||||
pg (0.12.2)
|
pg (0.12.2)
|
||||||
pg (0.12.2-x86-mingw32)
|
pg (0.12.2-x86-mingw32)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
rack (1.4.1)
|
rack (1.4.3)
|
||||||
rack-cache (1.2)
|
rack-cache (1.2)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-ssl (1.3.2)
|
rack-ssl (1.3.2)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.1)
|
rails (3.2.11)
|
||||||
actionmailer (= 3.2.1)
|
actionmailer (= 3.2.11)
|
||||||
actionpack (= 3.2.1)
|
actionpack (= 3.2.11)
|
||||||
activerecord (= 3.2.1)
|
activerecord (= 3.2.11)
|
||||||
activeresource (= 3.2.1)
|
activeresource (= 3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.1)
|
railties (= 3.2.11)
|
||||||
rails3-jquery-autocomplete (1.0.10)
|
rails3-jquery-autocomplete (1.0.10)
|
||||||
rails (~> 3.0)
|
rails (~> 3.0)
|
||||||
railties (3.2.1)
|
railties (3.2.11)
|
||||||
actionpack (= 3.2.1)
|
actionpack (= 3.2.11)
|
||||||
activesupport (= 3.2.1)
|
activesupport (= 3.2.11)
|
||||||
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)
|
thor (>= 0.14.6, < 2.0)
|
||||||
rake (0.9.2.2)
|
rake (10.0.3)
|
||||||
rdoc (3.12)
|
rdoc (3.12)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
sass (3.2.1)
|
sass (3.2.1)
|
||||||
|
@ -101,16 +101,17 @@ GEM
|
||||||
railties (~> 3.2.0)
|
railties (~> 3.2.0)
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
tilt (~> 1.3)
|
tilt (~> 1.3)
|
||||||
sprockets (2.1.3)
|
sprockets (2.2.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
thor (0.14.6)
|
thor (0.16.0)
|
||||||
tilt (1.3.3)
|
tilt (1.3.3)
|
||||||
treetop (1.4.10)
|
treetop (1.4.12)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.33)
|
tzinfo (0.3.35)
|
||||||
uglifier (1.3.0)
|
uglifier (1.3.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.0, >= 1.0.2)
|
multi_json (~> 1.0, >= 1.0.2)
|
||||||
|
@ -130,7 +131,7 @@ DEPENDENCIES
|
||||||
jquery-rails
|
jquery-rails
|
||||||
json
|
json
|
||||||
pg
|
pg
|
||||||
rails (= 3.2.1)
|
rails (= 3.2.11)
|
||||||
rails3-jquery-autocomplete
|
rails3-jquery-autocomplete
|
||||||
sass-rails (~> 3.2.3)
|
sass-rails (~> 3.2.3)
|
||||||
uglifier (>= 1.0.3)
|
uglifier (>= 1.0.3)
|
||||||
|
|
Loading…
Reference in a new issue