Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rails from 3.2.8 to 3.2.17 #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.8'
gem 'rails', '3.2.17'

gem "mongoid", "~> 3.0"
gem "bson_ext", "~> 1.5"
Expand Down
101 changes: 51 additions & 50 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
arel (3.0.3)
bson (1.7.0)
bson_ext (1.7.0)
bson (~> 1.7.0)
builder (3.0.0)
builder (3.0.4)
capistrano (2.13.5)
highline
net-scp (>= 1.0.0)
Expand Down Expand Up @@ -61,6 +61,7 @@ GEM
coffee-script-source (1.3.3)
columnize (0.3.6)
commonjs (0.2.6)
concurrent-ruby (1.1.5)
daemons (1.1.9)
database_cleaner (0.8.0)
debugger (1.2.0)
Expand Down Expand Up @@ -110,18 +111,19 @@ GEM
has_scope (0.5.1)
hashie (1.2.0)
highline (1.6.15)
hike (1.2.1)
hike (1.2.3)
http_parser.rb (0.5.3)
httpauth (0.1)
i18n (0.6.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
journey (1.0.4)
jquery-rails (2.1.1)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
json (2.2.0)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.7.4)
Expand All @@ -142,14 +144,13 @@ GEM
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta-tags (1.2.6)
actionpack
method_source (0.8)
mime-types (1.19)
mime-types (1.25.1)
mongoid (3.0.5)
activemodel (~> 3.1)
moped (~> 1.1)
Expand All @@ -160,7 +161,7 @@ GEM
rake
rspec (>= 2.9)
moped (1.2.1)
multi_json (1.3.6)
multi_json (1.14.1)
multipart-post (1.1.5)
nestful (0.0.8)
activesupport (>= 3.0.0.beta)
Expand Down Expand Up @@ -204,34 +205,34 @@ GEM
faye-websocket (~> 0.4, >= 0.4.4)
http_parser.rb (~> 0.5.3)
multi_json (~> 1.0)
polyglot (0.3.3)
polyglot (0.3.5)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.4.1)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.9.0)
rack (>= 0.4)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.8)
railties (= 3.2.17)
rails_config (0.3.1)
activesupport (>= 3.0)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -243,8 +244,7 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
rdoc (3.9.5)
redcarpet (2.1.1)
responders (0.9.2)
railties (~> 3.1)
Expand Down Expand Up @@ -280,8 +280,9 @@ GEM
activemodel (~> 3.0)
slop (3.3.3)
spin (0.5.3)
sprockets (2.1.3)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.10.2)
Expand All @@ -290,10 +291,10 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
thor (0.20.3)
tilt (1.4.1)
timecop (0.4.5)
treetop (1.4.10)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turnip (1.0.0)
Expand All @@ -304,7 +305,7 @@ GEM
less-rails (~> 2.2.3)
railties (>= 3.1)
therubyracer (~> 0.10.2)
tzinfo (0.3.33)
tzinfo (0.3.55)
uglifier (1.2.7)
execjs (>= 0.3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -350,7 +351,7 @@ DEPENDENCIES
omniauth-twitter
poltergeist
pry
rails (= 3.2.8)
rails (= 3.2.17)
rails_config
rake
rb-fchange
Expand Down