diff --git a/Gemfile b/Gemfile index dfefbab772..5d81dc6607 100644 --- a/Gemfile +++ b/Gemfile @@ -63,14 +63,14 @@ gem 'em-http-request', '~> 1.1.2' gem 'faraday', '~> 0.9.0' gem 'faraday_middleware' gem 'feed-normalizer' -gem 'font-awesome-sass', '~> 4.3' +gem 'font-awesome-sass', '~> 4.3.2' gem 'foreman', '~> 0.63.0' # geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5 # in its own Gemfile. gem 'geokit', '~> 1.8.4' gem 'geokit-rails', '~> 2.0.1' gem 'httparty', '~> 0.13' -gem 'jquery-rails', '~> 3.1.0' +gem 'jquery-rails', '~> 3.1.3' gem 'json', '~> 1.8.1' gem 'jsonpath', '~> 0.5.6' gem 'kaminari', '~> 0.16.1' @@ -81,9 +81,9 @@ gem 'mysql2', '~> 0.3.16' gem 'multi_xml' gem 'nokogiri', '~> 1.6.4' gem 'omniauth' -gem 'rails' , '4.2.1' +gem 'rails' , '4.2.2' gem 'rufus-scheduler', '~> 3.0.8', require: false -gem 'sass-rails', '~> 5.0' +gem 'sass-rails', '~> 5.0.3' gem 'select2-rails', '~> 3.5.4' gem 'spectrum-rails' gem 'string-scrub' # for ruby <2.1 @@ -117,7 +117,7 @@ group :development do end group :production do - gem 'rack' + gem 'rack', '> 1.5.0' end # Platform requirements. diff --git a/Gemfile.lock b/Gemfile.lock index b1ffde94a0..d127872f71 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,36 +32,36 @@ GEM remote: https://rubygems.org/ specs: ace-rails-ap (2.0.1) - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) 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.2) + actionview (= 4.2.2) + activesupport (= 4.2.2) 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) + actionview (4.2.2) + activesupport (= 4.2.2) 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) + activejob (4.2.2) + activesupport (= 4.2.2) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.2) + activemodel (= 4.2.2) + activesupport (= 4.2.2) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -159,7 +159,7 @@ GEM hpricot (>= 0.6) simple-rss (>= 1.1) ffi (1.9.5) - font-awesome-sass (4.3.1) + font-awesome-sass (4.3.2.1) sass (~> 3.2) forecast_io (2.0.0) faraday @@ -174,7 +174,7 @@ GEM geokit-rails (2.0.1) geokit (~> 1.5) rails (>= 3.0) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) google-api-client (0.7.1) addressable (>= 2.3.2) @@ -202,7 +202,6 @@ GEM rspec (>= 2.14, < 4.0) hashie (2.0.5) haversine (0.3.0) - hike (1.2.3) hipchat (1.2.0) httparty hitimes (1.2.2) @@ -221,10 +220,10 @@ GEM hypdf (1.0.7) httmultiparty (= 0.3.10) i18n (0.7.0) - jquery-rails (3.1.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.3) jsonpath (0.5.6) multi_json jwt (1.4.1) @@ -241,7 +240,7 @@ GEM celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.0.1) + loofah (2.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.9) macaddr (1.7.1) @@ -251,12 +250,12 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (2.5) + mime-types (2.6.1) mini_magick (4.2.3) mini_portile (0.6.2) - minitest (5.5.1) + minitest (5.7.0) mqtt (0.3.1) - multi_json (1.11.0) + multi_json (1.11.1) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.16) @@ -306,19 +305,19 @@ GEM pry (>= 0.9.10) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.1) + rack (1.6.4) 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.2) + actionmailer (= 4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) + activemodel (= 4.2.2) + activerecord (= 4.2.2) + activesupport (= 4.2.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -333,9 +332,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.2) + actionpack (= 4.2.2) + activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -387,8 +386,8 @@ GEM rufus-scheduler (3.0.9) tzinfo safe_yaml (1.0.4) - sass (3.4.12) - sass-rails (5.0.1) + sass (3.4.14) + sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -417,12 +416,9 @@ GEM spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) + sprockets (3.2.0) rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) + sprockets-rails (2.3.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -515,7 +511,7 @@ DEPENDENCIES faraday_middleware feed-normalizer ffi (>= 1.9.4) - font-awesome-sass (~> 4.3) + font-awesome-sass (~> 4.3.2) forecast_io (~> 2.0.0) foreman (~> 0.63.0) geokit (~> 1.8.4) @@ -528,7 +524,7 @@ DEPENDENCIES hipchat (~> 1.2.0) httparty (~> 0.13) hypdf (~> 1.0.7) - jquery-rails (~> 3.1.0) + jquery-rails (~> 3.1.3) json (~> 1.8.1) jsonpath (~> 0.5.6) kaminari (~> 0.16.1) @@ -550,8 +546,8 @@ DEPENDENCIES protected_attributes (~> 1.0.8) pry-rails quiet_assets - rack - rails (= 4.2.1) + rack (> 1.5.0) + rails (= 4.2.2) rails_12factor rr rspec (~> 3.2) @@ -561,7 +557,7 @@ DEPENDENCIES rturk (~> 2.12.1) ruby-growl (~> 4.1.0) rufus-scheduler (~> 3.0.8) - sass-rails (~> 5.0) + sass-rails (~> 5.0.3) select2-rails (~> 3.5.4) shoulda-matchers slack-notifier (~> 1.0.0)