Skip to content

Commit

Permalink
Gem upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-desteffen committed Aug 23, 2015
1 parent 920489a commit 08c6987
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 83 deletions.
16 changes: 8 additions & 8 deletions Gemfile
@@ -1,30 +1,30 @@
source "https://rubygems.org"
ruby "2.2.2"

gem 'rails', '4.2.1'
gem "pg", "0.18.1"
gem 'jquery-rails', "4.0.3"
gem 'rails', '4.2.4.rc1'
gem "pg", "0.18.2"
gem 'jquery-rails', "4.0.4"
gem 'friendly_id', '5.1.0'
gem 'bcrypt', '3.1.10'
gem 'redcarpet', '3.2.3'
gem 'redcarpet', '3.3.2'
gem 'pygmentize', '0.0.3'
gem 'thin', '1.6.3'
gem 'rakismet', '1.5.1'
gem 'kaminari', '0.16.3'
gem 'pg_search', "1.0.0"
gem 'pg_search', "1.0.4"

gem 'sass-rails', "5.0.3"
gem 'coffee-rails', "4.1.0"
gem 'uglifier', "2.7.1"

group :development, :test do
gem 'rspec-rails', '3.2.1'
gem 'rspec-rails', '3.3.3'
gem "factory_girl_rails", "4.5.0"
gem "byebug", "4.0.5"
gem "byebug", "6.0.2"
gem "spring", "~> 1.3.4"
end

group :production do
gem 'exception_notification', '4.1.0'
gem 'exception_notification', '4.1.1'
gem 'rails_12factor'
end
148 changes: 73 additions & 75 deletions Gemfile.lock
@@ -1,112 +1,110 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
actionmailer (4.2.4.rc1)
actionpack (= 4.2.4.rc1)
actionview (= 4.2.4.rc1)
activejob (= 4.2.4.rc1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.1)
actionview (= 4.2.1)
activesupport (= 4.2.1)
actionpack (4.2.4.rc1)
actionview (= 4.2.4.rc1)
activesupport (= 4.2.4.rc1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.4.rc1)
activesupport (= 4.2.4.rc1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.4.rc1)
activesupport (= 4.2.4.rc1)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
activemodel (4.2.4.rc1)
activesupport (= 4.2.4.rc1)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
activerecord (4.2.4.rc1)
activemodel (= 4.2.4.rc1)
activesupport (= 4.2.4.rc1)
arel (~> 6.0)
activesupport (4.2.1)
activesupport (4.2.4.rc1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
arel (6.0.3)
bcrypt (3.1.10)
builder (3.2.2)
byebug (4.0.5)
columnize (= 0.9.0)
byebug (6.0.2)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
daemons (1.2.2)
daemons (1.2.3)
diff-lcs (1.2.5)
erubis (2.7.0)
eventmachine (1.0.7)
exception_notification (4.1.0)
eventmachine (1.0.8)
exception_notification (4.1.1)
actionmailer (>= 3.0.4)
activesupport (>= 3.0.4)
execjs (2.5.2)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
friendly_id (5.1.0)
activerecord (>= 4.0.0)
globalid (0.3.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
i18n (0.7.0)
jquery-rails (4.0.3)
jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
json (1.8.3)
kaminari (0.16.3)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
loofah (2.0.1)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.6.0)
minitest (5.8.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
pg (0.18.1)
pg_search (1.0.0)
pg (0.18.2)
pg_search (1.0.4)
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
pygmentize (0.0.3)
rack (1.6.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.1)
actionmailer (= 4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
activemodel (= 4.2.1)
activerecord (= 4.2.1)
activesupport (= 4.2.1)
rails (4.2.4.rc1)
actionmailer (= 4.2.4.rc1)
actionpack (= 4.2.4.rc1)
actionview (= 4.2.4.rc1)
activejob (= 4.2.4.rc1)
activemodel (= 4.2.4.rc1)
activerecord (= 4.2.4.rc1)
activesupport (= 4.2.4.rc1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.1)
railties (= 4.2.4.rc1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
Expand All @@ -116,43 +114,43 @@ GEM
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
rails_stdout_logging (0.0.4)
railties (4.2.4.rc1)
actionpack (= 4.2.4.rc1)
activesupport (= 4.2.4.rc1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rakismet (1.5.1)
redcarpet (3.2.3)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
redcarpet (3.3.2)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-mocks (3.2.1)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.1)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
sass (3.4.13)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
sass (3.4.17)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
spring (1.3.4)
sprockets (3.0.1)
spring (1.3.6)
sprockets (3.3.3)
rack (~> 1.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -174,21 +172,21 @@ PLATFORMS

DEPENDENCIES
bcrypt (= 3.1.10)
byebug (= 4.0.5)
byebug (= 6.0.2)
coffee-rails (= 4.1.0)
exception_notification (= 4.1.0)
exception_notification (= 4.1.1)
factory_girl_rails (= 4.5.0)
friendly_id (= 5.1.0)
jquery-rails (= 4.0.3)
jquery-rails (= 4.0.4)
kaminari (= 0.16.3)
pg (= 0.18.1)
pg_search (= 1.0.0)
pg (= 0.18.2)
pg_search (= 1.0.4)
pygmentize (= 0.0.3)
rails (= 4.2.1)
rails (= 4.2.4.rc1)
rails_12factor
rakismet (= 1.5.1)
redcarpet (= 3.2.3)
rspec-rails (= 3.2.1)
redcarpet (= 3.3.2)
rspec-rails (= 3.3.3)
sass-rails (= 5.0.3)
spring (~> 1.3.4)
thin (= 1.6.3)
Expand Down

0 comments on commit 08c6987

Please sign in to comment.