From 8df44fd72b326025f14ed1d36a6bc61a7e727ccd Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 1 Mar 2016 15:19:59 +0100 Subject: [PATCH] Gem update. --- Gemfile | 2 +- Gemfile.lock | 133 +++++++++++++++++++++++++-------------------------- 2 files changed, 65 insertions(+), 70 deletions(-) diff --git a/Gemfile b/Gemfile index 584dd0716..3a46c92f9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '2.2.3' -gem 'rails', '4.2.5.1' +gem 'rails', '4.2.5.2' gem 'rails-observers' gem 'activerecord-session_store' diff --git a/Gemfile.lock b/Gemfile.lock index 3c86514fc..6995975a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,40 @@ GEM remote: https://rubygems.org/ specs: - abstract_type (0.0.7) - actionmailer (4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) + actionmailer (4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.1) - actionview (= 4.2.5.1) - activesupport (= 4.2.5.1) + actionpack (4.2.5.2) + actionview (= 4.2.5.2) + activesupport (= 4.2.5.2) 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.1) - activesupport (= 4.2.5.1) + actionview (4.2.5.2) + activesupport (= 4.2.5.2) 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.1) - activesupport (= 4.2.5.1) + activejob (4.2.5.2) + activesupport (= 4.2.5.2) globalid (>= 0.3.0) - activemodel (4.2.5.1) - activesupport (= 4.2.5.1) + activemodel (4.2.5.2) + activesupport (= 4.2.5.2) builder (~> 3.1) - activerecord (4.2.5.1) - activemodel (= 4.2.5.1) - activesupport (= 4.2.5.1) + activerecord (4.2.5.2) + activemodel (= 4.2.5.2) + activesupport (= 4.2.5.2) arel (~> 6.0) activerecord-session_store (0.1.2) actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activesupport (4.2.5.1) + activesupport (4.2.5.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -44,23 +43,18 @@ GEM addressable (2.4.0) arel (6.0.3) ast (2.2.0) - autoprefixer-rails (6.3.1) + autoprefixer-rails (6.3.3.1) execjs - json - biz (1.3.3) - abstract_type (~> 0.0.0) + biz (1.3.4) clavius (~> 1.0) - equalizer (~> 0.0.0) - memoizable (~> 0.4.0) tzinfo - browser (1.1.0) + browser (2.0.1) buftok (0.2.0) builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - clavius (1.0.1) - memoizable (~> 0.4.0) - coderay (1.1.0) + clavius (1.0.2) + coderay (1.1.1) coffee-rails (4.1.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.1.x) @@ -72,7 +66,7 @@ GEM coffee-script execjs json - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) daemons (1.2.3) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -80,9 +74,9 @@ GEM activerecord (>= 3.0, < 5) delayed_job (>= 3.0, < 5) diffy (3.1.0) - dnsruby (1.59.1) + dnsruby (1.59.2) docile (1.1.5) - domain_name (0.5.25) + domain_name (0.5.20160216) unf (>= 0.0.5, < 1.0.0) eco (1.0.0) coffee-script @@ -114,7 +108,7 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-livereload (2.5.1) + guard-livereload (2.5.2) em-websocket (~> 0.5) guard (~> 2.8) guard-compat (~> 1.0) @@ -134,15 +128,15 @@ GEM icalendar (2.3.0) inflection (1.0.0) json (1.8.3) - jwt (1.5.2) + jwt (1.5.1) koala (2.2.0) addressable faraday multi_json libv8 (3.16.14.13) - 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) @@ -151,7 +145,7 @@ 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.4) multi_json (1.11.2) @@ -159,27 +153,26 @@ GEM multipart-post (2.0.0) mysql2 (0.3.20) naught (1.1.0) - nenv (0.2.0) - net-ldap (0.13.0) + nenv (0.3.0) + net-ldap (0.14.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) - oauth (0.4.7) - oauth2 (1.0.0) + oauth (0.5.1) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.3.0) - addressable (~> 2.3) + omniauth-google-oauth2 (0.3.1) jwt (~> 1.0) multi_json (~> 1.3) omniauth (>= 1.1.1) @@ -195,33 +188,33 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - parser (2.3.0.2) + parser (2.3.0.6) ast (~> 2.2) pluginator (1.3.0) power_assert (0.2.7) powerpack (0.1.1) - pre-commit (0.26.0) + pre-commit (0.27.0) pluginator (~> 1.1) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (2.16.0) + puma (3.0.2) rack (1.6.4) rack-livereload (0.3.16) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.1) - actionmailer (= 4.2.5.1) - actionpack (= 4.2.5.1) - actionview (= 4.2.5.1) - activejob (= 4.2.5.1) - activemodel (= 4.2.5.1) - activerecord (= 4.2.5.1) - activesupport (= 4.2.5.1) + rails (4.2.5.2) + actionmailer (= 4.2.5.2) + actionpack (= 4.2.5.2) + actionview (= 4.2.5.2) + activejob (= 4.2.5.2) + activemodel (= 4.2.5.2) + activerecord (= 4.2.5.2) + activesupport (= 4.2.5.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.1) + railties (= 4.2.5.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -233,24 +226,25 @@ GEM loofah (~> 2.0) rails-observers (0.1.2) activemodel (~> 4.0) - railties (4.2.5.1) - actionpack (= 4.2.5.1) - activesupport (= 4.2.5.1) + railties (4.2.5.2) + actionpack (= 4.2.5.2) + activesupport (= 4.2.5.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) rake (10.5.0) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) ref (2.0.0) - rubocop (0.36.0) - parser (>= 2.3.0.0, < 3.0) + rubocop (0.37.2) + parser (>= 2.3.0.4, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) + unicode-display_width (~> 0.3) ruby-progressbar (1.7.5) - rubyzip (1.1.7) + rubyzip (1.2.0) sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -259,7 +253,7 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) scrub_rb (1.0.1) - selenium-webdriver (2.50.0) + selenium-webdriver (2.52.0) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -267,7 +261,7 @@ GEM shellany (0.0.1) simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.11.1) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -275,11 +269,11 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - spring (1.6.2) + spring (1.6.4) sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.1) + sprockets-rails (3.0.3) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -310,7 +304,8 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) + unicode-display_width (0.3.1) websocket (1.2.2) writeexcel (1.0.5) zendesk_api (1.13.4) @@ -359,7 +354,7 @@ DEPENDENCIES pre-commit puma rack-livereload - rails (= 4.2.5.1) + rails (= 4.2.5.2) rails-observers rb-fsevent rubocop