From af170671ec67afd374376a653978b4484e016be5 Mon Sep 17 00:00:00 2001 From: Georg G Date: Sat, 18 Apr 2015 21:50:08 +0200 Subject: [PATCH] update gems --- Gemfile | 2 +- Gemfile.lock | 221 ++++++++++++++++++++++++++++----------------------- 2 files changed, 123 insertions(+), 100 deletions(-) diff --git a/Gemfile b/Gemfile index 752f53f1..da648c94 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://rails-assets.org' -gem 'rails', '4.1.8' +gem 'rails', '4.2.1' gem 'pg', group: :postgres gem 'mysql2', group: :mysql diff --git a/Gemfile.lock b/Gemfile.lock index 2824f547..0ccea24c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/retrospring/questiongenerator.git - revision: 326d82728a96ff58bad4516c46f9abba06ba31df + revision: 902de3d7f930a4f67bbbbc414cc3556cc7114839 specs: questiongenerator (0.1.0) @@ -8,38 +8,47 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + actionmailer (4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.1) + actionview (= 4.2.1) + activesupport (= 4.2.1) + rack (~> 1.6) rack-test (~> 0.6.2) - actionview (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.1) + activesupport (= 4.2.1) + globalid (>= 0.3.0) + activemodel (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) - arel (~> 5.0.0) - activesupport (4.1.8) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.1) + activemodel (= 4.2.1) + activesupport (= 4.2.1) + arel (~> 6.0) + activesupport (4.2.1) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) - bcrypt (3.1.9) + addressable (2.3.8) + arel (6.0.0) + bcrypt (3.1.10) bootstrap-sass (3.2.0.2) sass (~> 3.2) - bootstrap_form (2.2.0) + bootstrap_form (2.3.0) bootswatch-rails (3.2.4) railties (>= 3.1) buftok (0.2.0) @@ -55,20 +64,20 @@ GEM climate_control (0.0.3) activesupport (>= 3.0) cliver (0.3.2) - cocaine (0.5.5) + cocaine (0.5.7) climate_control (>= 0.0.3, < 1.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - connection_pool (2.1.0) - crass (1.0.1) - daemons (1.1.9) - database_cleaner (1.3.0) - delayed_paperclip (2.9.0) + coffee-script-source (1.9.1.1) + connection_pool (2.2.0) + crass (1.0.2) + daemons (1.2.2) + database_cleaner (1.4.1) + delayed_paperclip (2.9.1) paperclip (>= 3.3) devise (3.4.1) bcrypt (~> 3.0) @@ -81,11 +90,10 @@ GEM devise (~> 3.2) diff-lcs (1.2.5) docile (1.1.5) - dotenv (1.0.2) - equalizer (0.0.9) + equalizer (0.0.11) erubis (2.7.0) - eventmachine (1.0.3) - execjs (2.2.2) + eventmachine (1.0.7) + execjs (2.5.2) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -93,7 +101,7 @@ GEM railties (>= 3.0.0) faker (1.4.3) i18n (~> 0.5) - faraday (0.9.0) + faraday (0.9.1) multipart-post (>= 1.2, < 3) faraday_middleware (0.9.1) faraday (>= 0.7.4, < 0.10) @@ -101,52 +109,56 @@ GEM railties (>= 3.2, < 5.0) font-kit-rails (1.1.0) rails - foreman (0.76.0) - dotenv (~> 1.0.2) + foreman (0.78.0) thor (~> 0.19.1) + globalid (0.3.5) + activesupport (>= 4.1.0) haml (4.0.6) tilt - hashie (3.3.2) + hashie (3.4.1) hike (1.2.3) hitimes (1.2.2) - http (0.6.3) + http (0.6.4) http_parser.rb (~> 0.6.0) - http_accept_language (2.0.2) + http_accept_language (2.0.5) http_parser.rb (0.6.0) - i18n (0.6.11) - jbuilder (2.2.5) + i18n (0.7.0) + jbuilder (2.2.13) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.3) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks jquery-ui-rails (5.0.3) railties (>= 3.2.16) - json (1.8.1) - kaminari (0.16.1) + json (1.8.2) + kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.9.2) + kgio (2.9.3) + loofah (2.0.1) + nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.4.3) - multi_json (1.10.1) + mini_portile (0.6.2) + minitest (5.6.0) + multi_json (1.11.0) multipart-post (2.0.0) - mysql2 (0.3.17) + mysql2 (0.3.18) naught (1.0.0) nested_form (0.3.2) - nokogiri (1.6.5) + nokogiri (1.6.6.2) mini_portile (~> 0.6.0) nokogumbo (1.2.0) nokogiri - nprogress-rails (0.1.6.3) + nprogress-rails (0.1.6.6) oauth (0.4.7) omniauth (1.2.2) hashie (>= 1.2, < 4) @@ -165,39 +177,48 @@ GEM activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - pg (0.17.1) - poltergeist (1.5.1) + pg (0.18.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - rack (1.5.2) + rack (1.6.0) rack-pjax (0.8.0) nokogiri (~> 1.5) rack (~> 1.1) rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.8) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) - sprockets-rails (~> 2.0) - rails-assets-growl (1.2.4) + railties (= 4.2.1) + sprockets-rails + rails-assets-growl (1.2.5) rails-assets-jquery - rails-assets-jquery (2.1.1) - rails_admin (0.6.5) + rails-assets-jquery (2.1.3) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.6) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) + rails_admin (0.6.7) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) haml (~> 4.0) - jquery-rails (~> 3.0) + jquery-rails (>= 3.0, < 5) jquery-ui-rails (~> 5.0) kaminari (~> 0.14) nested_form (~> 0.3) @@ -205,23 +226,23 @@ GEM rails (~> 4.0) remotipart (~> 1.0) safe_yaml (~> 1.0) - sass-rails (~> 4.0) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + sass-rails (>= 4.0, < 6) + railties (4.2.1) + actionpack (= 4.2.1) + activesupport (= 4.2.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) rake (10.4.2) rdoc (4.2.0) json (~> 1.4) - redcarpet (3.2.2) - redis (3.2.0) - redis-namespace (1.5.1) + redcarpet (3.2.3) + redis (3.2.1) + redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) remotipart (1.2.1) - responders (1.1.2) - railties (>= 3.2, < 4.2) + responders (2.1.0) + railties (>= 4.2.0, < 5) rspec-core (3.0.4) rspec-support (~> 3.0.0) rspec-expectations (3.0.4) @@ -238,9 +259,9 @@ GEM rspec-mocks (~> 3.0.0) rspec-support (~> 3.0.0) rspec-support (3.0.4) - ruby-progressbar (1.7.0) + ruby-progressbar (1.7.5) safe_yaml (1.0.4) - sanitize (3.1.0) + sanitize (3.1.2) crass (~> 1.0.1) nokogiri (>= 1.4.4) nokogumbo (= 1.2.0) @@ -253,45 +274,45 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sidekiq (3.3.0) + sidekiq (3.3.3) celluloid (>= 0.16.0) - connection_pool (>= 2.0.0) + connection_pool (>= 2.1.1) json redis (>= 3.0.6) redis-namespace (>= 1.3.1) - simple_oauth (0.3.0) - simplecov (0.9.1) + simple_oauth (0.3.1) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) simplecov-json (0.2) json simplecov simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sinatra (1.4.5) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - spring (1.2.0) + tilt (>= 1.3, < 3) + spring (1.3.4) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.2) + sprockets-rails (2.2.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sweetalert-rails (0.3.3) + sweetalert-rails (0.5.0) railties (>= 3.1.0) thin (1.6.3) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) hitimes @@ -304,7 +325,7 @@ GEM simple_oauth turbolinks (2.5.3) coffee-rails - twitter (5.13.0) + twitter (5.14.0) addressable (~> 2.3) buftok (~> 0.2.0) equalizer (~> 0.0.9) @@ -317,7 +338,7 @@ GEM simple_oauth (~> 0.3.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.3) @@ -326,7 +347,9 @@ GEM raindrops (~> 0.7) warden (1.2.3) rack (>= 1.0) - websocket-driver (0.4.0) + websocket-driver (0.5.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) will_paginate (3.0.7) will_paginate-bootstrap (1.0.1) will_paginate (>= 3.0.3) @@ -366,7 +389,7 @@ DEPENDENCIES pg poltergeist questiongenerator! - rails (= 4.1.8) + rails (= 4.2.1) rails-assets-growl rails_admin redcarpet