diff --git a/Gemfile b/Gemfile index 2f704b742..39672aa95 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ end if Bundler::VERSION < '2' source 'https://rubygems.org' # core -gem 'rails', '4.2.4' # when update, all initializers eis_custom files needs check/update +gem 'rails', '4.2.5.1' # when update, all initializers eis_custom files needs check/update gem 'iso8601', '0.8.6' # for dates and times gem 'hashie-forbidden_attributes', '0.1.1' gem 'SyslogLogger', '2.0', require: 'syslog/logger' @@ -32,17 +32,17 @@ gem 'rails-settings-cached', '0.4.1' # for settings # html-xml gem 'haml-rails', '0.9.0' # haml for views -gem 'nokogiri', '1.6.6.2' # For XML parsing +gem 'nokogiri', '1.6.7.2' # For XML parsing # style gem 'sass-rails', '5.0.3' # sass style gem 'bootstrap-sass', '3.3.5.1' # bootstrap style # js -gem 'uglifier', '2.7.1' # minifies js +gem 'uglifier', '2.7.2' # minifies js gem 'coffee-rails', '4.1.0' # coffeescript support gem 'turbolinks', '2.5.3' # faster page load -gem 'jquery-rails', '4.0.3' # jquery +gem 'jquery-rails', '4.0.4' # jquery gem 'selectize-rails', '0.12.1' # include selectize.js for select gem 'therubyracer', '0.12.2', platforms: :ruby gem 'jquery-validation-rails', '1.13.1' # validate on client side @@ -57,7 +57,7 @@ gem 'bootstrap-datepicker-rails', '1.3.1.1' # datepicker gem 'liquid', '3.0.6' # for email templates # rights -gem 'devise', '3.5.1' # authenitcation +gem 'devise', '3.5.4' # authenitcation gem 'cancancan', '1.11.0' # autharization # rest api diff --git a/Gemfile.lock b/Gemfile.lock index ab901068e..61cb04828 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,38 +50,38 @@ GEM specs: SyslogLogger (2.0) 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.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) 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.1) + actionview (= 4.2.5.1) + activesupport (= 4.2.5.1) 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.1) + activesupport (= 4.2.5.1) 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.1) + activesupport (= 4.2.5.1) globalid (>= 0.3.0) - activemodel (4.2.4) - activesupport (= 4.2.4) + activemodel (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) - activerecord (4.2.4) - activemodel (= 4.2.4) - activesupport (= 4.2.4) + activerecord (4.2.5.1) + activemodel (= 4.2.5.1) + activesupport (= 4.2.5.1) arel (~> 6.0) activerecord-import (0.7.0) activerecord (>= 3.0) - activesupport (4.2.4) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -157,6 +157,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) + concurrent-ruby (1.0.0) countries (0.11.4) currencies (~> 0.4.2) i18n_data (~> 0.7.0) @@ -173,7 +174,7 @@ GEM activerecord (>= 3.1.0, < 5.0.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.1) + devise (3.5.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -276,7 +277,7 @@ GEM jbuilder (2.2.16) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (4.0.3) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -306,12 +307,12 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.6.1) + mime-types (2.99) mina (0.3.1) open4 (~> 1.3.4) rake - mini_portile (0.6.2) - minitest (5.8.0) + mini_portile2 (2.0.0) + minitest (5.8.4) monetize (1.1.0) money (~> 6.5.0) money (6.5.1) @@ -326,8 +327,8 @@ GEM nenv (0.2.0) netrc (0.11.0) newrelic_rpm (3.12.0.288) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) notiffany (0.0.7) nenv (~> 0.1) @@ -371,16 +372,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) railroady (1.3.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.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) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.4) + railties (= 4.2.5.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -388,18 +389,18 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails-settings-cached (0.4.1) rails (>= 4.0.0) - railties (4.2.4) - actionpack (= 4.2.4) - activesupport (= 4.2.4) + railties (4.2.5.1) + actionpack (= 4.2.5.1) + activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) raindrops (0.15.0) - rake (10.4.2) + rake (10.5.0) ransack (1.5.1) actionpack (>= 3.0) activerecord (>= 3.0) @@ -416,8 +417,8 @@ GEM unparser (~> 0.2.2) ref (2.0.0) request_store (1.1.0) - responders (2.1.0) - railties (>= 4.2.0, < 5) + 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) @@ -501,12 +502,13 @@ GEM spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.3.4) - rack (~> 1.0) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sys-uname (0.9.0) ffi (>= 1.0.0) terminal-table (1.5.2) @@ -522,7 +524,7 @@ GEM coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) @@ -549,7 +551,7 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - warden (1.2.3) + warden (1.2.6) rack (>= 1.0) wasabi (3.5.0) httpi (~> 2.0) @@ -585,7 +587,7 @@ DEPENDENCIES data_migrate! database_cleaner (= 1.4.1) deep_cloneable (= 2.1.1) - devise (= 3.5.1) + devise (= 3.5.4) digidoc_client (= 0.2.1) epp (= 1.4.2)! epp-xml (= 1.0.4) @@ -604,7 +606,7 @@ DEPENDENCIES isikukood iso8601 (= 0.8.6) jbuilder (= 2.2.16) - jquery-rails (= 4.0.3) + jquery-rails (= 4.0.4) jquery-ui-rails (= 5.0.5) jquery-validation-rails (= 1.13.1) kaminari (= 0.16.3) @@ -613,7 +615,7 @@ DEPENDENCIES mina (= 0.3.1) money-rails (= 1.4.1) newrelic_rpm (= 3.12.0.288) - nokogiri (= 1.6.6.2) + nokogiri (= 1.6.7.2) nprogress-rails (= 0.1.6.7) paper_trail! parallel @@ -627,7 +629,7 @@ DEPENDENCIES que-web (= 0.4.0) que_mailer! railroady (= 1.3.0) - rails (= 4.2.4) + rails (= 4.2.5.1) rails-settings-cached (= 0.4.1) rake ransack (= 1.5.1) @@ -647,7 +649,7 @@ DEPENDENCIES therubyracer (= 0.12.2) traceroute (= 0.5.0) turbolinks (= 2.5.3) - uglifier (= 2.7.1) + uglifier (= 2.7.2) unicorn uuidtools (= 2.1.5) validates_email_format_of (= 1.6.3)