From 2907eb3e523fd9a5b7ca237f9159bb177f9d6966 Mon Sep 17 00:00:00 2001 From: silky Date: Wed, 29 Nov 2017 11:26:45 +1100 Subject: [PATCH] update versions --- Gemfile | 2 +- Gemfile.lock | 126 +++++++++++++++++++++++++++------------------------ 2 files changed, 69 insertions(+), 59 deletions(-) diff --git a/Gemfile b/Gemfile index 630c44a5..90e3a28b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ ruby '2.2.1' source 'http://rubygems.org' # Rails -gem 'rails', '4.2.1' +gem 'rails', '4.2.10' gem 'bcrypt', '~> 3.1.7' # Database stuff diff --git a/Gemfile.lock b/Gemfile.lock index e9e62131..8900d657 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,40 +22,39 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) 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.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) 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.10) + activesupport (= 4.2.10) 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.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) activerecord-import (0.8.0) activerecord (>= 3.0) - activesupport (4.2.1) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -63,12 +62,12 @@ GEM annotate (2.6.8) activerecord (>= 3.2, <= 4.3) rake (~> 10.4) - arel (6.0.0) + arel (6.0.4) bcrypt (3.1.10) bourbon (3.2.4) sass (~> 3.2) thor - builder (3.2.2) + builder (3.2.3) byebug (4.0.5) columnize (= 0.9.0) capybara (2.4.4) @@ -91,12 +90,14 @@ GEM coffee-script-source (1.9.1.1) colorize (0.7.7) columnize (0.9.0) + concurrent-ruby (1.0.5) coveralls (0.8.1) json (~> 1.8) rest-client (>= 1.6.8, < 2) simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) + crass (1.0.3) daemons (1.2.2) dalli (2.7.4) database_cleaner (1.4.1) @@ -130,37 +131,40 @@ GEM multi_json font-awesome-rails (4.3.0.0) railties (>= 3.2, < 5.0) - globalid (0.3.5) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) hashie (3.4.1) hike (1.2.3) htmlentities (4.3.3) http-cookie (1.0.2) domain_name (~> 0.5) - i18n (0.7.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) jquery-rails (4.0.3) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.6) jwt (1.5.0) latex-decode (0.1.1) unicode (~> 0.4) - loofah (2.0.2) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.7.0) + mini_mime (>= 0.1.1) method_source (0.8.2) - mime-types (2.5) - mini_portile (0.6.2) - minitest (5.6.1) - multi_json (1.11.0) + mime-types (2.99.3) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.10.3) + multi_json (1.12.2) multi_xml (0.5.5) multipart-post (1.2.0) netrc (0.10.3) newrelic_rpm (3.12.0.288) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -176,7 +180,7 @@ GEM omniauth-oauth2 (1.3.0) oauth2 (~> 1.0) omniauth (~> 1.2) - ox (2.2.0) + ox (2.8.2) pg (0.18.2) pry (0.10.1) coderay (~> 1.1.0) @@ -191,34 +195,34 @@ GEM rack (>= 1.1, < 2.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.1) + rack (1.6.8) 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.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (10.5.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -269,7 +273,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -288,14 +292,14 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.19.4) + thread_safe (0.3.6) tilt (1.4.1) timecop (0.7.3) tins (1.5.1) turbolinks (2.5.3) coffee-rails - tzinfo (1.2.2) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (2.7.1) execjs (>= 0.3.0) @@ -345,7 +349,7 @@ DEPENDENCIES pry-rails puma quiet_assets - rails (= 4.2.1) + rails (= 4.2.10) rspec-rails ruby-prof sass-rails (= 4.0.3) @@ -362,3 +366,9 @@ DEPENDENCIES uglifier unidecoder (~> 1.1.2) will_paginate + +RUBY VERSION + ruby 2.2.1p85 + +BUNDLED WITH + 1.15.4