Upgrade rails to 3.2.14

openid
Marcin Kulik 11 years ago
parent e1286b407e
commit 761a7ea60b

@ -1,6 +1,6 @@
source 'http://rubygems.org'
gem 'rails', '3.2.13'
gem 'rails', '3.2.14'
gem 'jquery-rails', '~> 2.2.0'
gem 'pg', '~> 0.14.1'
gem 'carrierwave', '~> 0.8.0'
@ -16,7 +16,7 @@ gem 'sidekiq', '~> 2.13'
gem 'thin', '~> 1.5.0'
gem 'open4', '~> 1.3.0'
gem 'redcarpet', '~> 2.2.2'
gem 'slim'
gem 'slim', '~> 2.0.0'
gem 'tsm', :git => 'git://github.com/sickill/tsm.git'
gem 'dotenv-rails', '~> 0.8'

@ -8,12 +8,12 @@ GIT
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
actionmailer (3.2.14)
actionpack (= 3.2.14)
mail (~> 2.5.4)
actionpack (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -21,19 +21,19 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
activemodel (3.2.14)
activesupport (= 3.2.14)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activerecord (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
activeresource (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activesupport (3.2.14)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
airbrake (3.1.12)
activesupport
@ -138,7 +138,7 @@ GEM
http_parser.rb (0.5.3)
http_parser.rb (0.5.3-java)
httpauth (0.2.0)
i18n (0.6.1)
i18n (0.6.4)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
@ -177,7 +177,7 @@ GEM
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.23)
multi_json (1.7.7)
multi_json (1.7.8)
multipart-post (1.2.0)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@ -238,17 +238,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
rails (3.2.14)
actionmailer (= 3.2.14)
actionpack (= 3.2.14)
activerecord (= 3.2.14)
activeresource (= 3.2.14)
activesupport (= 3.2.14)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
railties (= 3.2.14)
railties (3.2.14)
actionpack (= 3.2.14)
activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@ -310,9 +310,9 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slim (2.0.0)
temple (~> 0.6.5)
tilt (~> 1.3, >= 1.3.3)
slim (2.0.1)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.4.5)
spoon (0.0.4)
ffi
@ -321,7 +321,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
temple (0.6.5)
temple (0.6.6)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@ -329,7 +329,7 @@ GEM
thor (0.18.1)
tilt (1.4.1)
timers (1.1.0)
treetop (1.4.12)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
@ -379,7 +379,7 @@ DEPENDENCIES
poltergeist (~> 1.3.0)
pry-rails (~> 0.3.0)
quiet_assets (~> 1.0.1)
rails (= 3.2.13)
rails (= 3.2.14)
rake (~> 10.0.4)
rb-inotify (~> 0.9.0)
redcarpet (~> 2.2.2)
@ -389,7 +389,7 @@ DEPENDENCIES
sidekiq (~> 2.13)
simple_form (~> 2.0.4)
simplecov (~> 0.7.1)
slim
slim (~> 2.0.0)
thin (~> 1.5.0)
tsm!
uglifier (>= 1.0.3)

Loading…
Cancel
Save