From 068b01a7c86110df1673e93ba624004925c25c81 Mon Sep 17 00:00:00 2001 From: Dan Elbert Date: Wed, 9 Mar 2016 11:51:27 -0600 Subject: [PATCH] Gem version bump --- Gemfile | 12 +++--- Gemfile.lock | 111 +++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 62 deletions(-) diff --git a/Gemfile b/Gemfile index 3536093..96ba88f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.5' +gem 'rails', '4.2.6' gem 'sqlite3' gem 'mysql2', '~> 0.3.18' gem 'sass-rails', '~> 5.0' @@ -12,16 +12,16 @@ gem 'uglifier', '>= 1.3.0' gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '~> 4.1.0' gem 'bootstrap-sass', '~> 3.3.6' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' -gem 'jbuilder', '~> 2.0' -gem 'cocoon', '~> 1.2.6' +gem 'turbolinks', '~> 2.5.3' +gem 'jbuilder', '~> 2.4' +gem 'cocoon', '~> 1.2.8' gem 'unitwise', '~> 2.0.0' # Use ActiveModel has_secure_password -gem 'bcrypt', '~> 3.1.7' +gem 'bcrypt', '~> 3.1.11' # Use Unicorn as the app server # gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index e9ba796..fcfb5ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,46 +1,45 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + activejob (4.2.6) + activesupport (= 4.2.6) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.6) + activesupport (= 4.2.6) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.6) 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.3) - autoprefixer-rails (6.3.1) + autoprefixer-rails (6.3.3.1) execjs - json - bcrypt (3.1.10) + bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) blankslate (3.1.3) @@ -48,9 +47,9 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) builder (3.2.2) - byebug (8.2.1) - cocoon (1.2.6) - coderay (1.1.0) + byebug (8.2.2) + cocoon (1.2.8) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -58,7 +57,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) database_cleaner (1.5.1) debug_inspector (0.0.2) diff-lcs (1.2.5) @@ -88,7 +87,7 @@ GEM guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) i18n (0.7.0) - jbuilder (2.4.0) + jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) jquery-rails (4.1.0) @@ -98,9 +97,9 @@ GEM json (1.8.3) libv8 (3.16.14.13) liner (0.2.4) - listen (3.0.5) + listen (3.0.6) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + rb-inotify (>= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) @@ -109,13 +108,13 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.99) + mime-types (2.99.1) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) multi_json (1.11.2) mysql2 (0.3.20) - nenv (0.2.0) - nokogiri (1.6.7.1) + nenv (0.3.0) + nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) @@ -129,16 +128,16 @@ GEM rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.6) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -146,23 +145,23 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.5.0) + rake (11.0.1) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) ref (2.0.0) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -170,7 +169,7 @@ GEM rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) - rspec-rails (3.4.0) + rspec-rails (3.4.2) actionpack (>= 3.0, < 4.3) activesupport (>= 3.0, < 4.3) railties (>= 3.0, < 4.3) @@ -192,7 +191,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.0.4) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -215,7 +214,7 @@ GEM memoizable (~> 0.4) parslet (~> 1.5) signed_multiset (~> 0.2) - web-console (2.2.1) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -225,23 +224,23 @@ PLATFORMS ruby DEPENDENCIES - bcrypt (~> 3.1.7) + bcrypt (~> 3.1.11) bootstrap-sass (~> 3.3.6) byebug - cocoon (~> 1.2.6) + cocoon (~> 1.2.8) database_cleaner (~> 1.5.1) factory_girl_rails (~> 4.5.0) guard (~> 2.13.0) guard-rspec - jbuilder (~> 2.0) - jquery-rails + jbuilder (~> 2.4) + jquery-rails (~> 4.1.0) mysql2 (~> 0.3.18) - rails (= 4.2.5) + rails (= 4.2.6) rspec-rails (~> 3.4.0) sass-rails (~> 5.0) sqlite3 therubyracer - turbolinks + turbolinks (~> 2.5.3) uglifier (>= 1.3.0) unitwise (~> 2.0.0) web-console (~> 2.0)