diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ca46a02..5e74a1f9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ * This file will be updated whenever a new release is put into production. * Any problems should be reported via the "report an issue" link in the footer of the application. +## Unreleased +### Fixed +* Renamed stylesheet files to remove junk deprication warnings during testing ([#1737](https://github.com/YaleSTC/reservations/issues/1737)) + +### Added + +### Removed + ## v6.3.2 - 2018-06-26 ### Fixed * Fixed incorrect evaluation of reservations affected by a blackout ([#1644](https://github.com/YaleSTC/reservations/issues/1644)). diff --git a/Gemfile b/Gemfile index 39aaef579..0bcc620f9 100644 --- a/Gemfile +++ b/Gemfile @@ -87,7 +87,7 @@ group :development, :test do gem 'awesome_print', '~> 1.8.0' gem 'codeclimate-test-reporter', '~> 1.0.8' gem 'database_cleaner', '~> 1.6.1' - gem 'rubocop', '~> 0.49.1', require: false + gem 'rubocop', '~> 0.58.1', require: false gem 'timecop', '~> 0.9.1' end diff --git a/Gemfile.lock b/Gemfile.lock index 3aaf8d5ce..26525f6b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GEM airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) - ast (2.3.0) + ast (2.4.0) autoprefixer-rails (7.1.2.2) execjs awesome_print (1.8.0) @@ -191,6 +191,7 @@ GEM inline_svg (1.2.2) activesupport (>= 3.0) nokogiri (>= 1.6) + jaro_winkler (1.5.1) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -266,12 +267,12 @@ GEM cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parallel (1.11.2) - parser (2.4.0.0) - ast (~> 2.2) + parallel (1.12.1) + parser (2.5.1.2) + ast (~> 2.4.0) party_foul (1.5.5) octokit (~> 3.1) - powerpack (0.1.1) + powerpack (0.1.2) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -343,8 +344,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) raindrops (0.18.0) rake (12.0.0) rb-fsevent (0.10.2) @@ -380,14 +380,15 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - rubocop (0.49.1) + rubocop (0.58.1) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) + ruby-progressbar (1.8.3) ruby_dep (1.5.0) rubycas-client (2.3.9) activesupport @@ -450,7 +451,7 @@ GEM thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -529,7 +530,7 @@ DEPENDENCIES redcarpet (~> 3.4.0) responders (~> 2.4.0) rspec-rails (~> 3.6.0) - rubocop (~> 0.49.1) + rubocop (~> 0.58.1) ruby-progressbar (~> 1.8.1) rubyzip (~> 1.2.1) sass-rails (~> 5.0.6) @@ -549,4 +550,4 @@ RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/app/assets/fonts/open-sans/stylesheet.css.scss b/app/assets/fonts/open-sans/stylesheet.scss similarity index 100% rename from app/assets/fonts/open-sans/stylesheet.css.scss rename to app/assets/fonts/open-sans/stylesheet.scss diff --git a/app/assets/stylesheets/_bootstrap_and_overrides.css.scss b/app/assets/stylesheets/_bootstrap_and_overrides.scss similarity index 100% rename from app/assets/stylesheets/_bootstrap_and_overrides.css.scss rename to app/assets/stylesheets/_bootstrap_and_overrides.scss diff --git a/app/assets/stylesheets/_global.css.scss b/app/assets/stylesheets/_global.scss similarity index 100% rename from app/assets/stylesheets/_global.css.scss rename to app/assets/stylesheets/_global.scss diff --git a/app/assets/stylesheets/_select2_customizations.css.scss b/app/assets/stylesheets/_select2_customizations.scss similarity index 100% rename from app/assets/stylesheets/_select2_customizations.css.scss rename to app/assets/stylesheets/_select2_customizations.scss diff --git a/app/assets/stylesheets/app_configs/_edit.css.scss b/app/assets/stylesheets/app_configs/_edit.scss similarity index 100% rename from app/assets/stylesheets/app_configs/_edit.css.scss rename to app/assets/stylesheets/app_configs/_edit.scss diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.scss similarity index 100% rename from app/assets/stylesheets/application.css.scss rename to app/assets/stylesheets/application.scss diff --git a/app/assets/stylesheets/blackouts/_new_recurring.css.scss b/app/assets/stylesheets/blackouts/_new_recurring.scss similarity index 100% rename from app/assets/stylesheets/blackouts/_new_recurring.css.scss rename to app/assets/stylesheets/blackouts/_new_recurring.scss diff --git a/app/assets/stylesheets/catalog/_index.css.scss b/app/assets/stylesheets/catalog/_index.scss similarity index 100% rename from app/assets/stylesheets/catalog/_index.css.scss rename to app/assets/stylesheets/catalog/_index.scss diff --git a/app/assets/stylesheets/equipment_models/_show.css.scss b/app/assets/stylesheets/equipment_models/_show.scss similarity index 100% rename from app/assets/stylesheets/equipment_models/_show.css.scss rename to app/assets/stylesheets/equipment_models/_show.scss diff --git a/app/assets/stylesheets/layouts/_application.css.scss b/app/assets/stylesheets/layouts/_application.scss similarity index 100% rename from app/assets/stylesheets/layouts/_application.css.scss rename to app/assets/stylesheets/layouts/_application.scss diff --git a/app/assets/stylesheets/layouts/_footer.css.scss b/app/assets/stylesheets/layouts/_footer.scss similarity index 100% rename from app/assets/stylesheets/layouts/_footer.css.scss rename to app/assets/stylesheets/layouts/_footer.scss diff --git a/app/assets/stylesheets/layouts/_navbar.css.scss b/app/assets/stylesheets/layouts/_navbar.scss similarity index 100% rename from app/assets/stylesheets/layouts/_navbar.css.scss rename to app/assets/stylesheets/layouts/_navbar.scss diff --git a/app/assets/stylesheets/print.css.scss b/app/assets/stylesheets/print.scss similarity index 100% rename from app/assets/stylesheets/print.css.scss rename to app/assets/stylesheets/print.scss diff --git a/app/assets/stylesheets/reservations/_cart_dates.css.scss b/app/assets/stylesheets/reservations/_cart_dates.scss similarity index 100% rename from app/assets/stylesheets/reservations/_cart_dates.css.scss rename to app/assets/stylesheets/reservations/_cart_dates.scss diff --git a/app/assets/stylesheets/reservations/_cart_sidebar.css.scss b/app/assets/stylesheets/reservations/_cart_sidebar.scss similarity index 100% rename from app/assets/stylesheets/reservations/_cart_sidebar.css.scss rename to app/assets/stylesheets/reservations/_cart_sidebar.scss diff --git a/app/assets/stylesheets/reservations/_index.css.scss b/app/assets/stylesheets/reservations/_index.scss similarity index 100% rename from app/assets/stylesheets/reservations/_index.css.scss rename to app/assets/stylesheets/reservations/_index.scss diff --git a/app/assets/stylesheets/reservations/_manage.css.scss b/app/assets/stylesheets/reservations/_manage.scss similarity index 100% rename from app/assets/stylesheets/reservations/_manage.css.scss rename to app/assets/stylesheets/reservations/_manage.scss diff --git a/app/assets/stylesheets/reservations/_new.css.scss b/app/assets/stylesheets/reservations/_new.scss similarity index 100% rename from app/assets/stylesheets/reservations/_new.css.scss rename to app/assets/stylesheets/reservations/_new.scss diff --git a/app/assets/stylesheets/reservations/_show.css.scss b/app/assets/stylesheets/reservations/_show.scss similarity index 100% rename from app/assets/stylesheets/reservations/_show.css.scss rename to app/assets/stylesheets/reservations/_show.scss diff --git a/app/assets/stylesheets/users/_import_success.css.scss b/app/assets/stylesheets/users/_import_success.scss similarity index 100% rename from app/assets/stylesheets/users/_import_success.css.scss rename to app/assets/stylesheets/users/_import_success.scss diff --git a/app/assets/stylesheets/users/_show.css.scss b/app/assets/stylesheets/users/_show.scss similarity index 100% rename from app/assets/stylesheets/users/_show.css.scss rename to app/assets/stylesheets/users/_show.scss