Skip to content

Commit

Permalink
Upgrade rails 3.2.19 to 3.2.22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
eoinkelly committed Jan 26, 2016
1 parent d2c684e commit ac6e666
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

ruby '2.1.2'

gem "rails", "~> 3.2.19"
gem "rails", "3.2.22.1"
gem 'unicorn'

gem 'tinymce-rails', '~> 4.1.4'
Expand Down
58 changes: 29 additions & 29 deletions Gemfile.lock
Expand Up @@ -48,12 +48,12 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
actionmailer (3.2.22)
actionpack (= 3.2.22)
actionmailer (3.2.22.1)
actionpack (= 3.2.22.1)
mail (~> 2.5.4)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
actionpack (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
Expand All @@ -63,18 +63,18 @@ GEM
sprockets (~> 2.2.1)
active_scaffold (3.3.3)
rails (~> 3.2.0)
activemodel (3.2.22)
activesupport (= 3.2.22)
activemodel (3.2.22.1)
activesupport (= 3.2.22.1)
builder (~> 3.0.0)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activerecord (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
activeresource (3.2.22.1)
activemodel (= 3.2.22.1)
activesupport (= 3.2.22.1)
activesupport (3.2.22.1)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts-as-taggable-on (3.3.0)
Expand Down Expand Up @@ -194,7 +194,7 @@ GEM
mime-types (1.25.1)
mini_exiftool (1.7.0)
mini_portile (0.6.2)
multi_json (1.11.1)
multi_json (1.11.2)
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand Down Expand Up @@ -237,21 +237,21 @@ GEM
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.4.7)
rack-cache (1.2)
rack-cache (1.5.1)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
railroady (1.1.1)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
rails (3.2.22.1)
actionmailer (= 3.2.22.1)
actionpack (= 3.2.22.1)
activerecord (= 3.2.22.1)
activeresource (= 3.2.22.1)
activesupport (= 3.2.22.1)
bundler (~> 1.0)
railties (= 3.2.22)
railties (= 3.2.22.1)
rails-erd (1.1.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
Expand All @@ -262,16 +262,16 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
railties (3.2.22.1)
actionpack (= 3.2.22.1)
activesupport (= 3.2.22.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rainbow (2.0.0)
raindrops (0.13.0)
rake (10.4.2)
rake (10.5.0)
rdoc (3.12.2)
json (~> 1.4)
rmagick (2.13.3)
Expand Down Expand Up @@ -331,7 +331,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.44)
tzinfo (0.3.46)
uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -407,7 +407,7 @@ DEPENDENCIES
psych (> 2.0.5)
quiet_assets
railroady
rails (~> 3.2.19)
rails (= 3.2.22.1)
rails-erd
rails_12factor
rake
Expand Down

0 comments on commit ac6e666

Please sign in to comment.