Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
John Wood committed Dec 6, 2013
1 parent 1e5f002 commit 07d4a92
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 49 deletions.
98 changes: 49 additions & 49 deletions Gemfile.lock
Expand Up @@ -27,54 +27,46 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
afm (0.2.0)
arel (4.0.0)
atomic (1.1.10)
arel (4.0.1)
atomic (1.1.14)
builder (3.1.4)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
coffee-rails (4.0.0)
capistrano (3.0.1)
i18n
rake (>= 10.0.0)
sshkit (>= 0.0.23)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
daemons (1.1.9)
docile (1.1.1)
dynamic_form (1.1.4)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
hashery (2.1.0)
highline (1.6.19)
execjs (2.0.2)
hashery (2.1.1)
hike (1.2.3)
i18n (0.6.4)
jquery-rails (3.0.2)
i18n (0.6.9)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (4.0.3)
jquery-rails
jquery-ui-rails (4.1.0)
railties (>= 3.1.0)
json (1.8.0)
libv8 (3.11.8.17)
json (1.8.1)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
mime-types (1.25.1)
minitest (4.7.5)
multi_json (1.7.7)
mysql2 (0.3.11)
multi_json (1.8.2)
mysql2 (0.3.14)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
pdf-reader (1.3.3)
Ascii85 (~> 1.0.0)
afm (~> 0.2.0)
Expand All @@ -98,7 +90,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
sprockets-rails (~> 2.0.0)
rails_autolink (1.1.0)
rails_autolink (1.1.5)
rails (> 3.1)
railties (4.0.0)
actionpack (= 4.0.0)
Expand All @@ -108,49 +100,57 @@ GEM
rake (10.1.0)
ref (1.0.5)
ruby-rc4 (0.1.5)
sass (3.2.9)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (3.2.12)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
shoulda (3.5.0)
shoulda-context (~> 1.0, >= 1.0.1)
shoulda-matchers (>= 1.4.1, < 3.0)
shoulda-context (1.1.4)
shoulda-matchers (2.2.0)
shoulda-context (1.1.6)
shoulda-matchers (2.4.0)
activesupport (>= 3.0.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
sprockets (2.10.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
sshkit (1.2.0)
net-scp (>= 1.1.2)
net-ssh
term-ansicolor
term-ansicolor (1.2.2)
tins (~> 0.8)
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
thin (1.5.1)
thin (1.6.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.0)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
treetop (1.4.14)
tins (0.13.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
ttfunk (1.0.3)
tzinfo (0.3.37)
uglifier (2.1.1)
tzinfo (0.3.38)
uglifier (2.3.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
json (>= 1.8.0)

PLATFORMS
ruby
Expand Down
2 changes: 2 additions & 0 deletions config/application.rb
Expand Up @@ -49,5 +49,7 @@ class Application < Rails::Application

# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'

config.i18n.enforce_available_locales = true
end
end

0 comments on commit 07d4a92

Please sign in to comment.