From: Claire Date: Fri, 28 Jan 2022 07:58:32 +0000 (+0100) Subject: Merge branch 'main' into glitch-soc/merge-upstream X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b2915613fb247597d3de2f80c2c007b3369ac5bb;p=mastodon.git Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream. --- b2915613fb247597d3de2f80c2c007b3369ac5bb diff --cc Gemfile index bcda409a9,afed1ac94..1ddb6f383 --- a/Gemfile +++ b/Gemfile @@@ -97,10 -97,8 +97,10 @@@ gem 'webauthn', '~> 3.0.0.alpha1 gem 'json-ld' gem 'json-ld-preloaded', '~> 3.2' - gem 'rdf-normalize', '~> 0.4' + gem 'rdf-normalize', '~> 0.5' +gem 'redcarpet', '~> 3.5' + group :development, :test do gem 'fabrication', '~> 2.24' gem 'fuubar', '~> 2.5' diff --cc Gemfile.lock index bf6b5474f,dc5b33964..545032b2a --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -493,9 -491,8 +493,9 @@@ GE rake (13.0.6) rdf (3.2.3) link_header (~> 0.0, >= 0.0.8) - rdf-normalize (0.4.0) - rdf (~> 3.1) + rdf-normalize (0.5.0) + rdf (~> 3.2) + redcarpet (3.5.1) redis (4.5.1) redis-namespace (1.8.1) redis (>= 3.0.4) @@@ -770,8 -766,7 +770,8 @@@ DEPENDENCIE rails-controller-testing (~> 1.0) rails-i18n (~> 6.0) rails-settings-cached (~> 0.6) - rdf-normalize (~> 0.4) + rdf-normalize (~> 0.5) + redcarpet (~> 3.5) redis (~> 4.5) redis-namespace (~> 1.8) rexml (~> 3.2) diff --cc package.json index 00a9ce37a,e6e9e7a64..921958803 --- a/package.json +++ b/package.json @@@ -72,10 -71,9 +72,10 @@@ "@github/webauthn-json": "^0.5.7", "@rails/ujs": "^6.1.4", "array-includes": "^3.1.4", + "atrament": "0.2.4", "arrow-key-navigation": "^1.2.0", "autoprefixer": "^9.8.8", - "axios": "^0.24.0", + "axios": "^0.25.0", "babel-loader": "^8.2.3", "babel-plugin-lodash": "^3.3.4", "babel-plugin-preval": "^5.0.0",