Merge pull request #2019 from ualbertalib/dependabot/bundler/rubocop-…

…rails-2.9.0 Bump rubocop-rails from 2.8.1 to 2.9.0
ualbertalib · Dec 10, 2020 · 65c5014 · 65c5014
2 parents 0047d8c + 5f29aee
commit 65c5014
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -78,6 +78,7 @@ and releases in Jupiter project adheres to [Semantic Versioning](http://semver.o
 - Fixed flapping announcement tests [#1915](https://github.com/ualbertalib/jupiter/issues/1915)
 - Fixed not being able to clear a community logo [#2009](https://github.com/ualbertalib/jupiter/issues/2009)
 - Fixed getting an error when deleting an item [#2009](https://github.com/ualbertalib/jupiter/issues/2009)
+- bump rubocop and fix cop violations [PR#2019](https://github.com/ualbertalib/jupiter/pull/2019)
 
 ### Security
 - add `noopener noreferrer` when opening a link in a new tab [PR#1344](https://github.com/ualbertalib/jupiter/pull/1344)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -380,10 +380,10 @@ GEM
     rubocop-performance (1.9.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.8.1)
+    rubocop-rails (2.9.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.87.0)
+      rubocop (>= 0.90.0, < 2.0)
     ruby-progressbar (1.10.1)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)

diff --git a/app/models/concerns/draft_properties.rb b/app/models/concerns/draft_properties.rb
@@ -22,7 +22,7 @@ module DraftProperties
     validates :files, presence: true, if: :validate_upload_files?
     validate :files_are_virus_free, if: :validate_upload_files?
 
-    scope :unpublished, -> { where(status: :active).where('uuid IS NULL') }
+    scope :unpublished, -> { where(status: :active).where(uuid: nil) }
 
     def communities
       return unless member_of_paths.present? && member_of_paths['community_id']