Bundle update

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    action-store (1.1.0)
+    action-store (1.1.1)
       rails (>= 5.2, < 7)
     actioncable (6.1.3.2)
       actionpack (= 6.1.3.2)
@@ -72,7 +72,7 @@ GEM
       nokogiri (>= 1.4)
     bcrypt (3.1.16)
     benchmark-ips (2.8.4)
-    bootsnap (1.7.2)
+    bootsnap (1.7.5)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -102,7 +102,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    connection_pool (2.2.5)
     crass (1.0.6)
     dead_end (1.1.6)
     derailed_benchmarks (2.0.1)
@@ -117,7 +117,7 @@ GEM
       rake (> 10, < 14)
       ruby-statistics (>= 2.1)
       thor (>= 0.19, < 2)
-    devise (4.7.3)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -127,7 +127,7 @@ GEM
       devise (>= 2.1.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.5.0)
+    doorkeeper (5.5.1)
       railties (>= 5)
     doorkeeper-i18n (5.2.2)
       doorkeeper (>= 5.2)
@@ -153,15 +153,19 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faraday (1.3.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
       faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
     faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     ffi (1.15.0)
     form-select (0.3.2)
       rails (>= 4.2)
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     get_process_mem (0.2.7)
@@ -190,7 +194,7 @@ GEM
       activesupport (>= 5.0.0)
     jieba-rb (5.0.0)
     json (2.5.1)
-    jwt (2.2.2)
+    jwt (2.2.3)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -207,7 +211,7 @@ GEM
       addressable (~> 2.7)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.9.1)
@@ -226,7 +230,7 @@ GEM
     mini_mime (1.0.3)
     mini_portile2 (2.5.1)
     minitest (5.14.4)
-    minitest-spec-rails (6.0.3)
+    minitest-spec-rails (6.0.4)
       minitest (>= 5.0)
       railties (>= 4.1)
     mocha (1.12.0)
@@ -244,8 +248,8 @@ GEM
     notifications (1.1.0)
       kaminari (>= 0.15)
       rails (>= 5.2)
-    oauth (0.5.5)
-    oauth2 (1.4.4)
+    oauth (0.5.6)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -274,16 +278,16 @@ GEM
       omniauth-oauth2 (>= 1.1.1)
     orm_adapter (0.5.0)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     pg (1.2.3)
-    pghero (2.7.4)
+    pghero (2.8.1)
       activerecord (>= 5)
     postmark (1.21.3)
       json
-    postmark-rails (0.20.0)
+    postmark-rails (0.21.0)
       actionmailer (>= 3.0.0)
-      postmark (~> 1.15)
+      postmark (>= 1.21.3, < 2.0)
     public_suffix (4.0.6)
     puma (5.2.2)
       nio4r (~> 2.0)
@@ -360,19 +364,19 @@ GEM
       netrc (~> 0.8)
     rexml (3.2.5)
     rouge (3.26.0)
-    rubocop (1.11.0)
+    rubocop (1.14.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.2)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     ruby-push-notifications (1.3.0)
@@ -397,14 +401,14 @@ GEM
       activerecord (>= 5.2, < 7)
       activesupport (>= 5.2, < 7)
     semantic_range (3.0.0)
-    sidekiq (6.1.3)
+    sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
     sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    social-share-button (1.2.3)
+    social-share-button (1.2.4)
       coffee-rails
     spring (2.1.1)
     sprockets (4.0.2)
@@ -415,9 +419,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
-    standard (1.0.1)
-      rubocop (= 1.11.0)
-      rubocop-performance (= 1.10.1)
+    standard (1.1.1)
+      rubocop (= 1.14.0)
+      rubocop-performance (= 1.11.2)
     thor (1.1.0)
     tilt (2.0.10)
     turbolinks (5.2.1)
@@ -433,11 +437,11 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (2.0.0)
-    view_component (2.26.1)
+    view_component (2.31.1)
       activesupport (>= 5.0.0, < 7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webpacker (5.2.1)
+    webpacker (5.3.0)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)

app/controllers/admin/users_controller.rb

@@ -10,16 +10,15 @@ def index
 
       if params[:q].present?
         qstr = "%#{params[:q].downcase}%"
-        scope = begin
-          case field
+        scope = case field
           when "login"
             scope.where("lower(login) LIKE ?", qstr)
           when "email"
             scope.where("lower(email) LIKE ?", qstr)
           when "name"
             scope.where("lower(name) LIKE ?", qstr)
-          end
         end
+
       end
 
       @users = scope.order(id: :desc).page(params[:page])

app/models/concerns/markdown_body.rb

@@ -13,11 +13,9 @@ def body_html
   end
 
   def description
-    @description = begin
-      Rails.cache.fetch([self, "description"]) do
-        text = Homeland::Html.plain(body_html)
-        truncate(text, length: 120)
-      end
+    @description = Rails.cache.fetch([self, "description"]) do
+      text = Homeland::Html.plain(body_html)
+      truncate(text, length: 120)
     end
   end
 end

lib/homeland/pipeline/markdown_filter.rb

@@ -115,9 +115,7 @@ def autolink(link, link_type)
       def renderer
         # Do not share a single Redcarpet::Markdown object across threads
         # https://github.com/vmg/redcarpet/pull/672
-        Thread.current[:homeland_markdown_renderer] ||= begin
-          Redcarpet::Markdown.new(Render, DEFAULT_OPTIONS)
-        end
+        Thread.current[:homeland_markdown_renderer] ||= Redcarpet::Markdown.new(Render, DEFAULT_OPTIONS)
       end
 
       def call

lib/tasks/release.rake

@@ -13,7 +13,7 @@ if Rails.env.development? || Rails.env.test?
       sh "git tag -d #{version_tag}"
     end
 
-    return false unless `git tag`.split(/\n/).include?(version_tag)
+    return false unless `git tag`.split("\n").include?(version_tag)
     puts "Tag #{version_tag} has already been created."
 
     git_push("origin")

public/packs-test/manifest.json

@@ -1,7 +1,7 @@
 {
   "admin.css": "/packs-test/css/admin-7670374a.css",
   "admin.js": "/packs-test/js/admin-4560e590dd1d9a147365.js",
-  "application.js": "/packs-test/js/application-c752879800ced79e55e1.js",
+  "application.js": "/packs-test/js/application-8b5e15aea9173f78502c.js",
   "entrypoints": {
     "admin": {
       "css": [
@@ -14,12 +14,12 @@
     "application": {
       "js": [
         "/packs-test/js/vendors-ec56b41034e7611e207b.chunk.js",
-        "/packs-test/js/application-c752879800ced79e55e1.js"
+        "/packs-test/js/application-8b5e15aea9173f78502c.js"
       ]
     },
     "front": {
       "css": [
-        "/packs-test/css/front-9d7677ab.css"
+        "/packs-test/css/front-7b285cf1.css"
       ],
       "js": [
         "/packs-test/js/front-d92d07559dc663e62049.js"
@@ -34,7 +34,7 @@
       ]
     }
   },
-  "front.css": "/packs-test/css/front-9d7677ab.css",
+  "front.css": "/packs-test/css/front-7b285cf1.css",
   "front.js": "/packs-test/js/front-d92d07559dc663e62049.js",
   "media/webfonts/fa-brands-400.eot": "/packs-test/media/webfonts/fa-brands-400-0fea2496.eot",
   "media/webfonts/fa-brands-400.svg": "/packs-test/media/webfonts/fa-brands-400-e33e2cf6.svg",

test/controllers/auth/sso_controller_test.rb

@@ -26,7 +26,7 @@
     end
 
     it "should work with destination_url" do
-      get auth_sso_path, headers: {"Cookie": "destination_url=/topics/123"}
+      get auth_sso_path, headers: {Cookie: "destination_url=/topics/123"}
       assert_equal 302, response.status
 
       # javascript code will handle redirection of user to return_sso_url
@@ -40,8 +40,8 @@
       @sso_url = "http://somesite.com/homeland-sso"
 
       @headers = {
-        "HTTP_CLIENT_IP": mock_ip,
-        "Host": Setting.domain
+        HTTP_CLIENT_IP: mock_ip,
+        Host: Setting.domain
       }
 
       Setting.stubs(:sso).returns(

yarn.lock

@@ -1881,9 +1881,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
-  version "1.0.30001146"
-  resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001146.tgz?cache=0&sync_timestamp=1602135209178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001146.tgz#c61fcb1474520c1462913689201fb292ba6f447c"
-  integrity sha1-xh/LFHRSDBRikTaJIB+ykrpvRHw=
+  version "1.0.30001222"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001222.tgz"
+  integrity sha512-rPmwUK0YMjfMlZVmH6nVB5U3YJ5Wnx3vmT5lnRO3nIKO8bJ+TRWMbGuuiSugDJqESy/lz+1hSrlQEagCtoOAWQ==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"