diff --git a/Gemfile b/Gemfile index b2d7199..b8cb74c 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ group :doc do end group :production do - gem 'mysql2', '~> 0.3.18' # Database + gem 'mysql2', '~> 0.4.10' # Database end group :test do @@ -85,4 +85,4 @@ gem 'delayed_job_active_record' gem 'httparty', '0.13.7' # windows support (linux timezone directory is used in the project) -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] \ No newline at end of file +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] diff --git a/Gemfile.lock b/Gemfile.lock index 016558d..07f8f77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,17 +35,18 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) - airbrake (4.3.5) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + airbrake (4.3.8) builder multi_json - airbrussh (1.3.0) + airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) - annotate (2.7.0) + annotate (2.7.4) activerecord (>= 3.2, < 6.0) - rake (~> 10.4) + rake (>= 10.4, < 13.0) arel (6.0.4) - bcrypt (3.1.10) + bcrypt (3.1.12) bootstrap-sass (3.2.0.0) sass (~> 3.2) bootstrap-switch-rails (3.3.3) @@ -59,50 +60,47 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.1.4) + capistrano-bundler (1.5.0) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.1.6) + capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.0.4) + capistrano-rbenv (2.1.4) capistrano (~> 3.1) sshkit (~> 1.3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - chunky_png (1.3.5) - climate_control (0.0.3) - activesupport (>= 3.0) + chunky_png (1.3.11) + climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - codeclimate-test-reporter (0.4.8) - simplecov (>= 0.7.1, < 1.0.0) - coffee-rails (4.1.1) + codeclimate-test-reporter (1.0.9) + simplecov (<= 0.13) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0) coffee-script (2.4.1) 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) - simplecov (~> 0.11.0) + coffee-script-source (1.12.2) + concurrent-ruby (1.1.4) + coveralls (0.8.19) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - tins (~> 1.6.0) + tins (~> 1.6) 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) - delayed_job_active_record (4.1.0) - activerecord (>= 3.0, < 5) + delayed_job (4.1.5) + activesupport (>= 3.0, < 5.3) + delayed_job_active_record (4.1.3) + activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) devise (3.5.6) bcrypt (~> 3.0) @@ -111,12 +109,10 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20160128) - unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.6.0) + execjs (2.7.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.6.0) @@ -124,7 +120,7 @@ GEM railties (>= 3.0.0) faker (1.4.2) i18n (~> 0.5) - faraday (0.9.2) + faraday (0.15.4) multipart-post (>= 1.2, < 3) friendly_id (5.1.0) activerecord (>= 4.0.0) @@ -138,16 +134,14 @@ GEM haml (>= 4.0.6, < 5.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - hashdiff (0.2.3) - hashie (3.4.3) + hashdiff (0.3.7) + hashie (3.6.0) hike (1.2.3) - html2haml (2.0.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-cookie (1.0.2) - domain_name (~> 0.5) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) @@ -160,36 +154,37 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - jwt (1.5.1) - loofah (2.2.2) + jwt (2.1.0) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) - mime-types (2.99.3) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) mimemagic (0.3.0) - mini_mime (1.0.0) - mini_portile2 (2.1.0) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.4.10) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (5.0.2) - netrc (0.11.0) - 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) + net-ssh (5.1.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) + rack (>= 1.6.2, < 3) omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) @@ -200,7 +195,8 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - rack (1.6.10) + public_suffix (3.0.3) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) rails (4.2.10) @@ -227,34 +223,30 @@ GEM activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.5.0) - rdoc (4.2.1) - json (~> 1.4) - responders (2.1.1) - railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.4.2) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rake (12.3.2) + rdoc (4.3.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - ruby_parser (3.7.3) - sexp_processor (~> 4.1) + rspec-support (~> 3.8.0) + rspec-rails (3.8.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + ruby_parser (3.12.0) + sexp_processor (~> 4.9) safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.5) @@ -262,15 +254,15 @@ GEM sass (~> 3.2.2) sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.6.1) - simplecov (0.11.2) + sexp_processor (4.11.0) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) spring (1.6.2) sprockets (2.12.5) hike (~> 1.2) @@ -282,28 +274,24 @@ GEM activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) sqlite3 (1.3.11) - sshkit (1.17.0) + sshkit (1.18.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - term-ansicolor (1.3.2) + term-ansicolor (1.7.0) tins (~> 1.0) thor (0.19.4) thread_safe (0.3.6) tilt (1.4.1) - tins (1.6.0) + tins (1.20.2) turbolinks (2.5.3) coffee-rails tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - warden (1.2.6) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + warden (1.2.7) rack (>= 1.0) - webmock (1.22.6) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -338,7 +326,7 @@ DEPENDENCIES httparty (= 0.13.7) identicon (= 0.0.5) jquery-rails (= 4.1.0) - mysql2 (~> 0.3.18) + mysql2 (~> 0.4.10) omniauth-oauth2 (= 1.3.1) paperclip (= 4.3.4) rails (= 4.2.10) @@ -354,4 +342,4 @@ DEPENDENCIES will_paginate (= 3.0.7) BUNDLED WITH - 1.17.2 + 1.17.3