From a4e21a274b434e06df1d975f4ff6198cd619fbc3 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 30 Nov 2015 14:06:12 +0100 Subject: [PATCH] Upgrade to rails 4.2.5. Added development dependencies pre-commit and coffeelint. --- Gemfile | 5 +- Gemfile.lock | 149 +++++++++++++++++++++++++++++---------------------- 2 files changed, 88 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 41621e07f..db2060306 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '4.2.4' +gem 'rails', '4.2.5' gem 'rails-observers' gem 'activerecord-session_store' @@ -86,7 +86,10 @@ group :development, :test do gem 'rb-fsevent', require: false # code QA + gem 'pre-commit' gem 'rubocop' + gem 'coffeelint' + end gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index a579b5567..e07a56aff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,40 +2,40 @@ GEM remote: http://rubygems.org/ specs: abstract_type (0.0.7) - actionmailer (4.2.4) - actionpack (= 4.2.4) - actionview (= 4.2.4) - activejob (= 4.2.4) + actionmailer (4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) 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.5) + actionview (= 4.2.5) + activesupport (= 4.2.5) 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.5) + activesupport (= 4.2.5) 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) + activejob (4.2.5) + activesupport (= 4.2.5) globalid (>= 0.3.0) - activemodel (4.2.4) - activesupport (= 4.2.4) + activemodel (4.2.5) + activesupport (= 4.2.5) builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) + activerecord (4.2.5) + activemodel (= 4.2.5) + activesupport (= 4.2.5) arel (~> 6.0) - activerecord-session_store (0.1.1) + activerecord-session_store (0.1.2) actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activesupport (4.2.4) + activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -46,10 +46,10 @@ GEM ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (6.0.3) + autoprefixer-rails (6.1.1) execjs json - biz (1.3.0) + biz (1.3.3) abstract_type (~> 0.0.0) clavius (~> 1.0) equalizer (~> 0.0.0) @@ -58,7 +58,7 @@ GEM browser (1.0.1) buftok (0.2.0) builder (3.2.2) - childprocess (0.5.6) + childprocess (0.5.8) ffi (~> 1.0, >= 1.0.11) clavius (1.0.1) memoizable (~> 0.4.0) @@ -69,7 +69,11 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.10.0) + coffeelint (1.11.0) + coffee-script + execjs + json daemons (1.2.3) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -90,7 +94,7 @@ GEM erubis (2.7.0) eventmachine (1.0.8) execjs (2.6.0) - faraday (0.9.1) + faraday (0.9.2) multipart-post (>= 1.2, < 3) ffi (1.9.10) formatador (0.2.5) @@ -105,24 +109,26 @@ GEM pry (>= 0.9.12) shellany (~> 0.0) thor (>= 0.18.1) - guard-livereload (2.4.0) + guard-compat (1.2.1) + guard-livereload (2.5.1) em-websocket (~> 0.5) guard (~> 2.8) + guard-compat (~> 1.0) multi_json (~> 1.8) - hashie (3.4.2) + hashie (3.4.3) http (0.6.4) http_parser.rb (~> 0.6.0) http_parser.rb (0.6.0) i18n (0.7.0) icalendar (2.3.0) json (1.8.3) - jwt (1.5.1) + jwt (1.5.2) koala (2.2.0) addressable faraday multi_json - libv8 (3.16.14.11) - listen (3.0.3) + libv8 (3.16.14.13) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) loofah (2.0.3) @@ -135,17 +141,17 @@ GEM thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.2) - minitest (5.8.1) + mini_portile2 (2.0.0) + minitest (5.8.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.20) naught (1.1.0) nenv (0.2.0) - net-ldap (0.11) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + net-ldap (0.12.1) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) notiffany (0.0.8) nenv (~> 0.1) shellany (~> 0.0) @@ -159,11 +165,14 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) - omniauth-facebook (2.0.1) + omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.2.6) - omniauth (> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-google-oauth2 (0.2.10) + addressable (~> 2.3) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (~> 1.3.1) omniauth-linkedin (0.2.0) omniauth-oauth (~> 1.0) omniauth-oauth (1.1.0) @@ -175,31 +184,34 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - parser (2.2.2.6) + parser (2.2.3.0) ast (>= 1.1, < 3.0) + pluginator (1.3.0) polyglot (0.3.5) - power_assert (0.2.4) + power_assert (0.2.6) powerpack (0.1.1) - pry (0.10.2) + pre-commit (0.26.0) + pluginator (~> 1.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (2.14.0) + puma (2.15.3) rack (1.6.4) rack-livereload (0.3.16) rack 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.5) + actionmailer (= 4.2.5) + actionpack (= 4.2.5) + actionview (= 4.2.5) + activejob (= 4.2.5) + activemodel (= 4.2.5) + activerecord (= 4.2.5) + activesupport (= 4.2.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.4) + railties (= 4.2.5) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -211,9 +223,9 @@ GEM loofah (~> 2.0) rails-observers (0.1.2) activemodel (~> 4.0) - railties (4.2.4) - actionpack (= 4.2.4) - activesupport (= 4.2.4) + railties (4.2.5) + actionpack (= 4.2.5) + activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -222,22 +234,23 @@ GEM rb-inotify (0.9.5) ffi (>= 0.5.0) ref (2.0.0) - rubocop (0.34.2) + rubocop (0.35.1) astrolabe (~> 1.3) - parser (>= 2.2.2.5, < 3.0) + parser (>= 2.2.3.0, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) + ruby-progressbar (~> 1.7) + tins (<= 1.6.0) ruby-progressbar (1.7.5) rubyzip (1.1.7) - sass (3.4.18) + sass (3.4.19) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (2.47.1) + selenium-webdriver (2.48.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -245,7 +258,7 @@ GEM shellany (0.0.1) simple-rss (1.3.1) simple_oauth (0.3.1) - simplecov (0.10.0) + simplecov (0.11.0) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) @@ -253,15 +266,15 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) - spring (1.4.0) - sprockets (3.3.4) - rack (~> 1.0) + spring (1.4.4) + sprockets (3.4.1) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) - test-unit (3.1.3) + sqlite3 (1.3.11) + test-unit (3.1.5) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -269,6 +282,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (2.0.1) + tins (1.6.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -301,6 +315,7 @@ DEPENDENCIES browser coffee-rails coffee-script-source + coffeelint daemons delayed_job_active_record diffy @@ -323,9 +338,10 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-linkedin omniauth-twitter + pre-commit puma rack-livereload - rails (= 4.2.4) + rails (= 4.2.5) rails-observers rb-fsevent rubocop @@ -342,3 +358,6 @@ DEPENDENCIES twitter (~> 5.13.0) uglifier writeexcel + +BUNDLED WITH + 1.10.5