diff --git a/Gemfile b/Gemfile index ed8bc48cb..3fed47413 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'devise' # assets: core asset dependencies gem 'coffee-rails', '~> 4.2' -gem 'sass-rails', '~> 5.0' +gem 'sassc-rails' gem 'uglifier', '>= 1.3.0' # view helpers: tools for forms, views, etc. @@ -48,7 +48,7 @@ gem 'pg_search' gem 'rollbar' # permalinks -gem 'friendly_id', '~> 5.1.0' +gem 'friendly_id', '~> 5.2.0' group :development, :test do gem 'brakeman', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 5e9ab9146..83d06c68b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,7 +70,7 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (10.0.2) - capybara (3.3.1) + capybara (3.4.2) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -123,7 +123,7 @@ GEM ffi (1.9.25) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) - friendly_id (5.1.0) + friendly_id (5.2.4) activerecord (>= 4.0.0) globalid (0.4.1) activesupport (>= 4.2.0) @@ -172,7 +172,7 @@ GEM mini_portile2 (~> 2.3.0) nori (2.6.0) orm_adapter (0.5.0) - pagy (0.13.1) + pagy (0.15.0) parallel (1.12.1) parser (2.5.1.2) ast (~> 2.4.0) @@ -192,7 +192,7 @@ GEM rack (2.0.5) rack-protection (2.0.3) rack - rack-test (1.0.0) + rack-test (1.1.0) rack (>= 1.0, < 3) rails (5.2.0) actioncable (= 5.2.0) @@ -232,9 +232,9 @@ GEM responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rollbar (2.16.3) + rollbar (2.16.4) multi_json - rubocop (0.58.1) + rubocop (0.58.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -245,17 +245,21 @@ GEM ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.5.6) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sassc (1.12.1) + ffi (~> 1.9.6) + sass (>= 3.3.0) + sassc-rails (1.3.0) + railties (>= 4.0.0) + sass + sassc (~> 1.9) + sprockets (> 2.11) + sprockets-rails + tilt savon (2.12.0) akami (~> 1.2) builder (>= 2.1.2) @@ -264,7 +268,7 @@ GEM nokogiri (>= 1.8.1) nori (~> 2.4) wasabi (~> 3.4) - selenium-webdriver (3.13.0) + selenium-webdriver (3.13.1) childprocess (~> 0.5) rubyzip (~> 1.2) sidekiq (5.1.3) @@ -300,7 +304,7 @@ GEM tilt (2.0.8) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.15) + uglifier (4.1.17) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -349,7 +353,7 @@ DEPENDENCIES dotenv-rails email_address font-awesome-rails - friendly_id (~> 5.1.0) + friendly_id (~> 5.2.0) groupdate jbuilder (~> 2.5) letter_opener @@ -364,7 +368,7 @@ DEPENDENCIES reek rollbar rubocop - sass-rails (~> 5.0) + sassc-rails savon (~> 2.12.0) selenium-webdriver sidekiq