diff --git a/.travis.yml b/.travis.yml
index 844612f84..5307f932f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,7 @@ script:
   - './cc-test-reporter before-build'
   - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "0" ]; then yarn test --colors; fi
   - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "0" ]; then ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.lcov.json; fi
-  - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then bundle exec bundle-audit check --update --ignore CVE-2015-9284 CVE-2020-26247; fi
+  - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then bundle exec bundle-audit check --update --ignore CVE-2015-9284; fi
   - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then yarn build-storybook; fi
   - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "2" ]; then bin/test-console-check; fi
   - bundle exec rake data_updates:run # required for at least creating the first admin user in e2e tests.
diff --git a/Gemfile b/Gemfile
index f11dd0df2..bf077174a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem "kaminari", "~> 1.2" # A Scope & Engine based, clean, powerful, customizable
 gem "katex", "~> 0.6.0" # This rubygem enables you to render TeX math to HTML using KaTeX. It uses ExecJS under the hood
 gem "liquid", "~> 4.0" # A secure, non-evaling end user template engine with aesthetic markup
 gem "mini_racer", "~> 0.3.1" # Minimal embedded v8
-gem "nokogiri", "~> 1.10" # HTML, XML, SAX, and Reader parser
+gem "nokogiri", "~> 1.11" # HTML, XML, SAX, and Reader parser
 gem "octokit", "~> 4.20" # Simple wrapper for the GitHub API
 gem "oj", "~> 3.10" # JSON parser and object serializer
 gem "omniauth", "~> 1.9" # A generalized Rack framework for multiple-provider authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index 193a6c523..5f1011ca8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -453,7 +453,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
     minitest (5.14.2)
@@ -466,8 +466,11 @@ GEM
     nenv (0.3.0)
     netrc (0.11.0)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -533,6 +536,7 @@ GEM
       rest-client (~> 2.0, >= 2.0.2)
     pusher-signature (0.1.8)
     raabro (1.4.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-attack (6.3.1)
       rack (>= 1.0, < 3)
@@ -903,7 +907,7 @@ DEPENDENCIES
   memory_profiler (~> 0.9)
   mini_racer (~> 0.3.1)
   nakayoshi_fork (~> 0.0.4)
-  nokogiri (~> 1.10)
+  nokogiri (~> 1.11)
   octokit (~> 4.20)
   oj (~> 3.10)
   omniauth (~> 1.9)
diff --git a/app/labor/code_block_parser.rb b/app/labor/code_block_parser.rb
index 79b878bf2..470c560c8 100644
--- a/app/labor/code_block_parser.rb
+++ b/app/labor/code_block_parser.rb
@@ -93,7 +93,7 @@ module CodeBlockParser
       next if el.name == "code"
 
       if el.search("code").empty?
-        el.swap(Html::ParseEmoji.call(el.to_html))
+        el.swap(Html::ParseEmoji.call(el.to_html)) if el.parent.present?
       else
         el.children = escape_colon_emojis_in_codeblock(el.children.to_html)
       end
diff --git a/vendor/cache/mini_portile2-2.4.0.gem b/vendor/cache/mini_portile2-2.4.0.gem
deleted file mode 100644
index 2d3f34784..000000000
Binary files a/vendor/cache/mini_portile2-2.4.0.gem and /dev/null differ
diff --git a/vendor/cache/mini_portile2-2.5.0.gem b/vendor/cache/mini_portile2-2.5.0.gem
new file mode 100644
index 000000000..cd8b4aa0f
Binary files /dev/null and b/vendor/cache/mini_portile2-2.5.0.gem differ
diff --git a/vendor/cache/nokogiri-1.10.10.gem b/vendor/cache/nokogiri-1.10.10.gem
deleted file mode 100644
index 655364f2b..000000000
Binary files a/vendor/cache/nokogiri-1.10.10.gem and /dev/null differ
diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem
new file mode 100644
index 000000000..2d8c028c2
Binary files /dev/null and b/vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem differ
diff --git a/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem b/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem
new file mode 100644
index 000000000..e03cbd3fb
Binary files /dev/null and b/vendor/cache/nokogiri-1.11.1-x86_64-linux.gem differ
diff --git a/vendor/cache/racc-1.5.2.gem b/vendor/cache/racc-1.5.2.gem
new file mode 100644
index 000000000..39f03fa79
Binary files /dev/null and b/vendor/cache/racc-1.5.2.gem differ