Merge remote-tracking branch 'origin/main' into depfu/batch_all/2023-…

…07-10 # Conflicts: # Gemfile.lock
wealthsimple · Jul 17, 2023 · 91f4606 · 91f4606
2 parents 2ff9fd4 + c1c30c5
commit 91f4606
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 7.1.3 - 2023-07-14
+### Changed
+- Added SECURITY.md file
+
+## 7.1.2 - 2023-07-13
+### Changed
+- Fix missing cop error with standard 1.3.0
+
 ## 7.1.1 - 2023-06-19
 ### Changed
 - Added Gitleaks as a pre-commit step

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    ws-style (7.1.1)
+    ws-style (7.1.3)
       rubocop-rspec (>= 2.2.0)
       rubocop-vendor (>= 0.11)
-      standard (>= 1.28.2)
+      standard (>= 1.30.1)
+      standard-custom (>= 1.0.2)
       standard-rails (>= 0.1.0)
 
 GEM
@@ -33,13 +34,13 @@ GEM
     lint_roller (1.1.0)
     minitest (5.18.1)
     parallel (1.23.0)
-    parse_a_changelog (1.2.0)
+    parse_a_changelog (1.3.0)
       treetop (~> 1.6)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
     polyglot (0.3.5)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     racc (1.7.1)
     rack (3.0.8)
     rainbow (3.1.1)
@@ -56,7 +57,7 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
@@ -96,8 +97,9 @@ GEM
       rubocop (~> 1.52.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.1.0)
-    standard-custom (1.0.1)
+    standard-custom (1.0.2)
       lint_roller (~> 1.0)
+      rubocop (~> 1.50)
     standard-performance (1.1.1)
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.18.0)

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,15 @@
+# Security Policy
+
+Wealthsimple secures our code base using a combination of code review, dependency review, and periodic security reviews. Static analysis is performed during automated verification additionally safeguards against common coding errors which may result in vulnerabilities.
+
+### Reporting a Vulnerability
+
+For general defects about this project, please file a [Bug Report](https://github.com/wealthsimple/ws-style/issues/new/choose)
+
+To report a vulnerability about this project please [Report a security vulnerability](https://github.com/wealthsimple/ws-style/security/advisories/new)
+
+If you have a vulnerability to report about the Wealthsimple platform, please use our white hat bug bounty program at [Hackerone](https://hackerone.com/wealthsimple)
+
+### General Support
+
+For additional support, please open a [Github Discussion](https://github.com/wealthsimple/ws-style/discussions). 
diff --git a/core.yml b/core.yml
@@ -8,6 +8,7 @@ inherit_mode:
 
 require:
   - standard
+  - standard-custom
   - rubocop-performance
   - rubocop-vendor
 

diff --git a/lib/ws/style/version.rb b/lib/ws/style/version.rb
@@ -1,5 +1,5 @@
 module Ws
   module Style
-    VERSION = '7.1.1'.freeze
+    VERSION = '7.1.3'.freeze
   end
 end
diff --git a/ws-style.gemspec b/ws-style.gemspec
@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 3.2.0'
 
-  s.add_dependency 'standard', '>= 1.28.2'
+  s.add_dependency 'standard', '>= 1.30.1'
+  s.add_dependency 'standard-custom', '>= 1.0.2'
   s.add_dependency 'standard-rails', '>= 0.1.0'
   s.add_dependency 'rubocop-rspec', '>= 2.2.0'
   s.add_dependency 'rubocop-vendor', '>= 0.11'