Merge pull request #4 from majacQ/dependabot/bundler/src-api/redcarpe…

…t-3.5.1 Bump redcarpet from 3.4.0 to 3.5.1 in /src-api
majacQ · Mar 25, 2021 · e1840fc · e1840fc
2 parents 7267700 + 49c1631
commit e1840fc
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,10 +20,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.13.10",
+  <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1
+    "@babel/preset-env": "^7.13.10",
+    "babel-loader": "^8.2.2",
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "webpack": "^5.26.3",
+  =======
     "@babel/preset-env": "^7.13.12",
     "babel-loader": "^8.2.2",
     "uglifyjs-webpack-plugin": "^1.3.0",
     "webpack": "^5.28.0",
+  >>>>>>> master
     "webpack-cli": "^3.1.0"
   }
 }
diff --git a/src-api/Gemfile b/src-api/Gemfile
@@ -7,6 +7,6 @@ gem 'middleman-syntax', '~> 3.0.0'
 gem 'middleman-autoprefixer', '~> 2.7.0'
 gem 'middleman-sprockets', '~> 4.1.0'
 gem 'rouge', '~> 2.0.5'
-gem 'redcarpet', '~> 3.4.0'
+gem 'redcarpet', '~> 3.5.1'
 gem 'nokogiri', '~> 1.10.8'
 gem "therubyracer"
diff --git a/src-api/Gemfile.lock b/src-api/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    redcarpet (3.4.0)
+    redcarpet (3.5.1)
     ref (2.0.0)
     rouge (2.0.7)
     sass (3.4.23)
@@ -126,7 +126,7 @@ DEPENDENCIES
   middleman-sprockets (~> 4.1.0)
   middleman-syntax (~> 3.0.0)
   nokogiri (~> 1.10.8)
-  redcarpet (~> 3.4.0)
+  redcarpet (~> 3.5.1)
   rouge (~> 2.0.5)
   therubyracer