Skip to content

Updated rails #145

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.

Sign up for GitHub

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

Merged
steveklabnik merged 1 commit into from
Feb 11, 2013
Merged

Updated rails #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .rvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use --create ruby-1.9.3-p327@hackety-hack.com
rvm use --create ruby-1.9.3@hackety-hack.com
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.1.10'
gem 'rails', '3.1.11'
gem 'json'

gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'
Expand Down
62 changes: 31 additions & 31 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ GIT
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.10)
actionpack (= 3.1.10)
actionmailer (3.1.11)
actionpack (= 3.1.11)
mail (~> 2.3.3)
actionpack (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
actionpack (3.1.11)
activemodel (= 3.1.11)
activesupport (= 3.1.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
Expand All @@ -29,20 +29,20 @@ GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.10)
activesupport (= 3.1.10)
activemodel (3.1.11)
activesupport (= 3.1.11)
builder (~> 3.0.0)
i18n (~> 0.6)
activerecord (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
activerecord (3.1.11)
activemodel (= 3.1.11)
activesupport (= 3.1.11)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
activeresource (3.1.10)
activemodel (= 3.1.10)
activesupport (= 3.1.10)
activesupport (3.1.10)
multi_json (>= 1.0, < 1.3)
activeresource (3.1.11)
activemodel (= 3.1.11)
activesupport (= 3.1.11)
activesupport (3.1.11)
multi_json (~> 1.0)
addressable (2.2.6)
arel (2.2.3)
bcrypt-ruby (3.0.1)
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.7.6)
json (1.7.7)
kgio (2.7.2)
launchy (2.0.5)
addressable (~> 2.2.6)
Expand All @@ -123,7 +123,7 @@ GEM
metadown (1.0.1)
redcarpet
method_source (0.7.0)
mime-types (1.19)
mime-types (1.21)
mm-devise (2.0)
devise (>= 1.2)
mongo_mapper (>= 0.9.0)
Expand All @@ -146,34 +146,34 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.7)
slop (>= 2.4.3, < 3)
rack (1.3.9)
rack (1.3.10)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.1.10)
actionmailer (= 3.1.10)
actionpack (= 3.1.10)
activerecord (= 3.1.10)
activeresource (= 3.1.10)
activesupport (= 3.1.10)
rails (3.1.11)
actionmailer (= 3.1.11)
actionpack (= 3.1.11)
activerecord (= 3.1.11)
activeresource (= 3.1.11)
activesupport (= 3.1.11)
bundler (~> 1.0)
railties (= 3.1.10)
railties (3.1.10)
actionpack (= 3.1.10)
activesupport (= 3.1.10)
railties (= 3.1.11)
railties (3.1.11)
actionpack (= 3.1.11)
activesupport (= 3.1.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
raindrops (0.8.0)
rake (10.0.3)
rdiscount (1.6.8)
rdoc (3.12)
rdoc (3.12.1)
json (~> 1.4)
redcarpet (2.1.0)
responders (0.6.5)
Expand Down Expand Up @@ -251,7 +251,7 @@ DEPENDENCIES
mongo_mapper
pg
pry
rails (= 3.1.10)
rails (= 3.1.11)
rdiscount
rspec-rails
sass-rails (~> 3.1.0)
Expand Down