diff --git a/Gemfile b/Gemfile index b4fecfd..b3e3575 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.4' +gem 'rails', '4.2.8' # Assets gem 'sass-rails', '~> 4.0.3' @@ -23,7 +23,7 @@ group :doc do end group :production do - gem 'mysql2', '~> 0.3.18' # Database + gem 'mysql2', '< 0.6.0', '>= 0.4.4' # Database end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index f52bd57..139b383 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,37 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) + actionmailer (4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.4) - actionview (= 4.2.4) - activesupport (= 4.2.4) + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) 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.4) - activesupport (= 4.2.4) + actionview (4.2.8) + activesupport (= 4.2.8) 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.4) - activesupport (= 4.2.4) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.8) + activesupport (= 4.2.8) globalid (>= 0.3.0) - activemodel (4.2.4) - activesupport (= 4.2.4) + activemodel (4.2.8) + activesupport (= 4.2.8) builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) arel (~> 6.0) - activesupport (4.2.4) + activesupport (4.2.8) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -43,14 +42,14 @@ GEM annotate (2.7.0) activerecord (>= 3.2, < 6.0) rake (~> 10.4) - arel (6.0.3) + arel (6.0.4) bcrypt (3.1.10) bootstrap-sass (3.2.0.0) sass (~> 3.2) bootstrap-switch-rails (3.3.3) bootstrap-will_paginate (0.0.10) will_paginate - builder (3.2.2) + builder (3.2.3) cancancan (1.13.1) capistrano (3.4.0) i18n @@ -84,6 +83,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) + concurrent-ruby (1.0.5) coveralls (0.8.10) json (~> 1.8) rest-client (>= 1.6.8, < 2) @@ -93,6 +93,7 @@ GEM tins (~> 1.6.0) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.4) daemons (1.2.3) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -123,8 +124,8 @@ GEM multipart-post (>= 1.2, < 3) friendly_id (5.1.0) activerecord (>= 4.0.0) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) haml (4.0.7) tilt haml-rails (0.9.0) @@ -146,33 +147,36 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) identicon (0.0.5) chunky_png jquery-rails (4.1.0) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) jwt (1.5.1) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.99) + mail (2.7.0) + mini_mime (>= 0.1.1) + mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mini_mime (1.0.0) + mini_portile2 (2.1.0) + minitest (5.11.3) + multi_json (1.13.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.5.2) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.0.2) netrc (0.11.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) oauth2 (1.1.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0, < 1.5.2) @@ -192,31 +196,31 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - rack (1.6.4) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.4) - actionmailer (= 4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) - activemodel (= 4.2.4) - activerecord (= 4.2.4) - activesupport (= 4.2.4) + rails (4.2.8) + actionmailer (= 4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + activemodel (= 4.2.8) + activerecord (= 4.2.8) + activesupport (= 4.2.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.4) + railties (= 4.2.8) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.4) - actionpack (= 4.2.4) - activesupport (= 4.2.4) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) @@ -264,7 +268,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) spring (1.6.2) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -279,13 +283,13 @@ GEM net-ssh (>= 2.8.0) term-ansicolor (1.3.2) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.19.4) + thread_safe (0.3.6) tilt (1.4.1) tins (1.6.0) turbolinks (2.5.3) coffee-rails - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -329,10 +333,10 @@ DEPENDENCIES httparty identicon jquery-rails - mysql2 (~> 0.3.18) + mysql2 (>= 0.4.4, < 0.6.0) omniauth-oauth2 (= 1.3.1) paperclip - rails (= 4.2.4) + rails (= 4.2.8) rspec-rails sass-rails (~> 4.0.3) sdoc (~> 0.4.0) @@ -344,4 +348,4 @@ DEPENDENCIES will_paginate (= 3.0.7) BUNDLED WITH - 1.11.2 + 1.16.3