Skip to content

Commit

Permalink
#23 Gems Updated with latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
emineeliftoscali committed Sep 7, 2013
1 parent 8d31387 commit a862452
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.0.0'
gem 'pg', '~> 0.15.1'
gem 'pg', '~> 0.16.0'
gem 'sass-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
Expand All @@ -15,13 +15,13 @@ gem 'exception_notification', '~> 4.0.0'
gem 'simple_form', '~> 3.0.0.rc'
gem 'rails_config', '~> 0.3.3'
gem 'compass-rails', github: 'Compass/compass-rails', branch: 'rails4-hack'
gem 'devise', '~> 3.0.0'
gem 'devise-i18n', '~> 0.8.6'
gem 'devise', '~> 3.1.0'
gem 'devise-i18n', '~> 0.9.0'
gem 'will_paginate', '~> 3.0.4'
gem 'will_paginate-bootstrap', '~> 0.2.3'
gem 'will-paginate-i18n', '~> 0.1.13'
gem 'paperclip', '~> 3.5.1'
gem 'kangal', '~> 0.1.2'
gem 'kangal', '~> 1.0.0'
gem 'rack-timeout', '~> 0.0.4'
gem 'recipient_interceptor', '~> 0.1.2'
gem 'ransack'
Expand All @@ -34,10 +34,10 @@ group :development, :test do
gem 'better_errors'
gem 'binding_of_caller'
gem 'letter_opener'
gem 'katip'
gem 'katip', '~> 1.2.1'
gem 'rspec-rails', '~> 2.14.0'
gem 'capybara', '~> 2.1.0'
gem 'shoulda-matchers', '~> 2.2.0'
gem 'shoulda-matchers', '~> 2.3.0'
gem 'factory_girl_rails', '~> 4.0'
gem 'sqlite3', '1.3.7'
gem 'sqlite3', '1.3.8'
end
29 changes: 15 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@ GEM
fssm (>= 0.2.7)
sass (~> 3.1)
debug_inspector (0.0.2)
devise (3.0.3)
devise (3.1.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-i18n (0.8.6)
devise-i18n (0.9.0)
diff-lcs (1.2.4)
erubis (2.7.0)
exception_notification (4.0.0)
Expand All @@ -106,10 +107,10 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
kangal (0.1.2)
kangal (1.0.0)
activemodel
mail
katip (1.1.0)
katip (1.2.1)
launchy (2.3.0)
addressable (~> 2.3)
letter_opener (1.1.2)
Expand All @@ -129,7 +130,7 @@ GEM
activesupport (>= 3.0.0)
cocaine (~> 0.5.0)
mime-types
pg (0.15.1)
pg (0.16.0)
polyamorous (0.6.4)
activerecord (>= 3.0)
polyglot (0.3.3)
Expand Down Expand Up @@ -182,7 +183,7 @@ GEM
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
shoulda-matchers (2.2.0)
shoulda-matchers (2.3.0)
activesupport (>= 3.0.0)
simple_form (3.0.0.rc)
actionpack (>= 4.0.0.rc1, < 4.1)
Expand All @@ -196,7 +197,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
sqlite3 (1.3.8)
thor (0.18.1)
thread_safe (0.1.2)
atomic
Expand Down Expand Up @@ -229,18 +230,18 @@ DEPENDENCIES
capybara (~> 2.1.0)
coffee-rails (~> 4.0.0)
compass-rails!
devise (~> 3.0.0)
devise-i18n (~> 0.8.6)
devise (~> 3.1.0)
devise-i18n (~> 0.9.0)
exception_notification (~> 4.0.0)
factory_girl_rails (~> 4.0)
haml (~> 4.0.2)
haml-rails
jquery-rails (~> 3.0.4)
kangal (~> 0.1.2)
katip
kangal (~> 1.0.0)
katip (~> 1.2.1)
letter_opener
paperclip (~> 3.5.1)
pg (~> 0.15.1)
pg (~> 0.16.0)
rack-timeout (~> 0.0.4)
rails (~> 4.0.0)
rails_config (~> 0.3.3)
Expand All @@ -250,9 +251,9 @@ DEPENDENCIES
rspec-rails (~> 2.14.0)
sass-rails (~> 4.0.0)
sdoc
shoulda-matchers (~> 2.2.0)
shoulda-matchers (~> 2.3.0)
simple_form (~> 3.0.0.rc)
sqlite3 (= 1.3.7)
sqlite3 (= 1.3.8)
turbolinks (~> 1.3.0)
uglifier (>= 1.3.0)
will-paginate-i18n (~> 0.1.13)
Expand Down

0 comments on commit a862452

Please sign in to comment.