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.

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

Jump to bottom

Updated gems #230

Merged
merged 1 commit into from
Mar 18, 2013
Merged

Updated gems #230

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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# Core gems
gem 'rails', '3.2.12'
gem 'rails', '3.2.13'

# Database adapters
gem 'pg'
Expand Down
97 changes: 48 additions & 49 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
actionmailer (3.2.13)
actionpack (= 3.2.13)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.3)
arel (3.0.2)
awesome_print (1.1.0)
aws-sdk (1.8.4)
aws-sdk (1.8.5)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
Expand All @@ -46,8 +46,8 @@ GEM
bourbon (3.1.1)
sass (>= 3.2.0)
thor
bourne (1.1.2)
mocha (= 0.10.5)
bourne (1.2.1)
mocha (= 0.12.7)
builder (3.0.4)
capybara (2.0.2)
mime-types (>= 1.16)
Expand Down Expand Up @@ -82,12 +82,11 @@ GEM
daemons (1.1.9)
database_cleaner (0.9.1)
debug_inspector (0.0.2)
debugger (1.4.0)
debugger (1.5.0)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.2.0)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.0)
devise (2.2.3)
bcrypt-ruby (~> 3.0)
Expand All @@ -111,7 +110,7 @@ GEM
enumerize (0.5.1)
activesupport (>= 3.2)
erubis (2.7.0)
eventmachine (1.0.1)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
Expand All @@ -138,12 +137,12 @@ GEM
pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6)
guard-rspec (2.5.0)
guard-rspec (2.5.1)
guard (>= 1.1)
rspec (~> 2.11)
hike (1.2.1)
http_parser.rb (0.5.3)
i18n (0.6.4)
i18n (0.6.1)
jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
Expand All @@ -164,17 +163,17 @@ GEM
addressable (~> 2.3)
listen (0.7.3)
lumberjack (1.0.2)
mail (2.4.4)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.21)
mocha (0.10.5)
mocha (0.12.7)
metaclass (~> 0.0.1)
multi_json (1.6.1)
nokogiri (1.5.6)
multi_json (1.7.1)
nokogiri (1.5.7)
orm_adapter (0.4.0)
paperclip (3.4.1)
activemodel (>= 3.0.0)
Expand Down Expand Up @@ -203,17 +202,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.12)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand All @@ -228,7 +227,7 @@ GEM
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.0)
Expand All @@ -240,7 +239,7 @@ GEM
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
sass (3.2.6)
sass (3.2.7)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
Expand All @@ -250,31 +249,31 @@ GEM
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
shoulda-matchers (1.4.2)
shoulda-matchers (1.5.0)
activesupport (>= 3.0.0)
bourne (~> 1.1.2)
bourne (~> 1.2.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.3)
slop (3.4.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
terminal-table (1.4.5)
thin (1.5.0)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.4)
tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.36)
tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -322,7 +321,7 @@ DEPENDENCIES
poltergeist
pry-rails
quiet_assets
rails (= 3.2.12)
rails (= 3.2.13)
remotipart
rspec-rails
sass-rails
Expand Down