Skip to content

A platform for community discussion. Free, open, simple.

DEV: Remove `dropFrom` parameter from deprecations (#38656)

David Taylorf0bf8f69a8dd
diff --git a/frontend/discourse-markdown-it/src/setup.js b/frontend/discourse-markdown-it/src/setup.js
index a26e40408b0..efcb3a707c2 100644
--- a/frontend/discourse-markdown-it/src/setup.js
+++ b/frontend/discourse-markdown-it/src/setup.js
@@ -294,7 +294,6 @@ class API {
whiteList(info) {
deprecated("`whiteList` has been replaced with `allowList`", {
since: "2.6.0.beta.4",
- dropFrom: "2.7.0",
id: "discourse.markdown-it.whitelist",
});
diff --git a/frontend/discourse/app/components/bread-crumbs.gjs b/frontend/discourse/app/components/bread-crumbs.gjs
index c360438536c..aacaafdbe55 100644
--- a/frontend/discourse/app/components/bread-crumbs.gjs
+++ b/frontend/discourse/app/components/bread-crumbs.gjs
@@ -160,7 +160,6 @@ export default class BreadCrumbs extends Component {
message="The argument 'tagId' is deprecated on the outlet 'bread-crumbs-left', use 'tag.name' instead"
id="discourse.plugin-connector.deprecated-arg.bread-crumbs-left"
since="2025.12.0-latest"
- dropFrom="2026.2.0-latest"
silence="discourse.header-service-topic"
)
}}
@@ -235,7 +234,6 @@ export default class BreadCrumbs extends Component {
message="The argument 'tagId' is deprecated on the outlet 'bread-crumbs-right', use 'tag.name' instead"
id="discourse.plugin-connector.deprecated-arg.bread-crumbs-right"
since="2025.12.0-latest"
- dropFrom="2026.2.0-latest"
silence="discourse.header-service-topic"
)
}}
diff --git a/frontend/discourse/app/components/d-section.gjs b/frontend/discourse/app/components/d-section.gjs
index e203d68b177..85c37a0979a 100644
--- a/frontend/discourse/app/components/d-section.gjs
+++ b/frontend/discourse/app/components/d-section.gjs
@@ -12,7 +12,6 @@ export default class DSection extends Component {
`<DSection> is deprecated. Use {{body-class "foo-page" "bar"}} and/or <section></section> instead.`,
{
since: "3.2.0.beta1",
- dropFrom: "3.3.0.beta1",
id: "discourse.d-section",
}
);
diff --git a/frontend/discourse/app/components/header/contents.gjs b/frontend/discourse/app/components/header/contents.gjs
index 8d501527be7..6b0d4f09f06 100644
--- a/frontend/discourse/app/components/header/contents.gjs
+++ b/frontend/discourse/app/components/header/contents.gjs
@@ -76,7 +76,6 @@ export default class Contents extends Component {
message="The argument 'topic' is deprecated on the outlet 'header-contents__before', use 'topicInfo' or 'topicInfoVisible' instead"
id="discourse.plugin-connector.deprecated-arg.header-contents.topic"
since="3.3.0.beta4-dev"
- dropFrom="3.4.0"
silence="discourse.header-service-topic"
)
}}
@@ -118,7 +117,6 @@ export default class Contents extends Component {
message="The argument 'topic' is deprecated on the outlet 'before-header-panel', use 'topicInfo' or 'topicInfoVisible' instead"
id="discourse.plugin-connector.deprecated-arg.header-contents.topic"
since="3.3.0.beta4-dev"
- dropFrom="3.4.0"
silence="discourse.header-service-topic"
)
}}
@@ -138,7 +136,6 @@ export default class Contents extends Component {
message="The argument 'topic' is deprecated on the outlet 'after-header-panel', use 'topicInfo' or 'topicInfoVisible' instead"
id="discourse.plugin-connector.deprecated-arg.header-contents.topic"
since="3.3.0.beta4-dev"
- dropFrom="3.4.0"
silence="discourse.header-service-topic"
)
}}
@@ -156,7 +153,6 @@ export default class Contents extends Component {
message="The argument 'topic' is deprecated on the outlet 'header-contents__after', use 'topicInfo' or 'topicInfoVisible' instead"
id="discourse.plugin-connector.deprecated-arg.header-contents.topic"
since="3.3.0.beta4-dev"
- dropFrom="3.4.0"
silence="discourse.header-service-topic"
)
}}
diff --git a/frontend/discourse/app/components/number-field.js b/frontend/discourse/app/components/number-field.js
index 864ad79e7e4..fc97829c923 100644
--- a/frontend/discourse/app/components/number-field.js
+++ b/frontend/discourse/app/components/number-field.js
@@ -14,7 +14,6 @@ export default class NumberField extends TextField {
{
id: "discourse.number-field",
since: "3.2.0.beta5",
- dropFrom: "3.3.0",
}
);
}
diff --git a/frontend/discourse/app/components/sidebar/section-link.gjs b/frontend/discourse/app/components/sidebar/section-link.gjs
index 9c60cc49c5b..f9c9188a29b 100644
--- a/frontend/discourse/app/components/sidebar/section-link.gjs
+++ b/frontend/discourse/app/components/sidebar/section-link.gjs
@@ -84,7 +84,6 @@ export default class SectionLink extends Component {
deprecated("SectionLink's @class arg has been renamed to @linkClass", {
id: "discourse.section-link-class-arg",
since: "3.2.0.beta4",
- dropFrom: "3.3.0.beta1",
});
classNames.push(this.args.class);
}
diff --git a/frontend/discourse/app/controllers/composer.js b/frontend/discourse/app/controllers/composer.js
index fb5782e216f..404f1f20769 100644
--- a/frontend/discourse/app/controllers/composer.js
+++ b/frontend/discourse/app/controllers/composer.js
@@ -18,7 +18,6 @@ function clearPopupMenuOptionsCallback() {
{
id: "discourse.composer-controller.clear-popup-menu-options-callback",
since: "3.2",
- dropFrom: "3.3",
}
);
diff --git a/frontend/discourse/app/helpers/deprecated-outlet-argument.js b/frontend/discourse/app/helpers/deprecated-outlet-argument.js
index bd634dc496c..c4e49b425d5 100644
--- a/frontend/discourse/app/helpers/deprecated-outlet-argument.js
+++ b/frontend/discourse/app/helpers/deprecated-outlet-argument.js
@@ -19,7 +19,6 @@ class DeprecatedOutletArgument {
this.options = {
id: options.id || "discourse.plugin-connector.deprecated-arg",
since: options.since,
- dropFrom: options.dropFrom,
url: options.url,
raiseError: options.raiseError,
};
diff --git a/frontend/discourse/app/instance-initializers/inject-objects.js b/frontend/discourse/app/instance-initializers/inject-objects.js
index bda5f7b7ad2..c25f7c06f30 100644
--- a/frontend/discourse/app/instance-initializers/inject-objects.js
+++ b/frontend/discourse/app/instance-initializers/inject-objects.js
@@ -18,7 +18,6 @@ export default {
`use injected siteSettings instead of Discourse.SiteSettings`,
{
since: "2.8",
- dropFrom: "3.2",
id: "discourse.global.site-settings",
}
);
@@ -31,7 +30,6 @@ export default {
`import discourse/models/user instead of using Discourse.User`,
{
since: "2.8",
- dropFrom: "3.2",
id: "discourse.global.user",
}
);
@@ -44,7 +42,6 @@ export default {
`import discourse/models/site instead of using Discourse.Site`,
{
since: "2.8",
- dropFrom: "3.2",
id: "discourse.global.site",
}
);
diff --git a/frontend/discourse/app/lib/category-hashtags.js b/frontend/discourse/app/lib/category-hashtags.js
index a3431750e8c..e627fbf0fda 100644
--- a/frontend/discourse/app/lib/category-hashtags.js
+++ b/frontend/discourse/app/lib/category-hashtags.js
@@ -15,7 +15,6 @@ export function categoryHashtagTriggerRule(textarea, opts) {
"categoryHashtagTriggerRule is being replaced by hashtagTriggerRule and the new hashtag-autocomplete plugin APIs",
{
since: "2.9.0.beta10",
- dropFrom: "3.0.0.beta1",
id: "discourse.category-hashtags.categoryHashtagTriggerRule",
}
);
diff --git a/frontend/discourse/app/lib/cookie.js b/frontend/discourse/app/lib/cookie.js
index e69a1ff5563..f3498943ed1 100644
--- a/frontend/discourse/app/lib/cookie.js
+++ b/frontend/discourse/app/lib/cookie.js
@@ -79,7 +79,6 @@ export function removeCookie(key, options) {
if (window && window.$) {
const depOpts = {
since: "2.6.0",
- dropFrom: "2.7.0",
id: "discourse.jquery-cookie",
};
window.$.cookie = function () {
diff --git a/frontend/discourse/app/lib/deprecated.js b/frontend/discourse/app/lib/deprecated.js
index 4b4c44039fc..d31ae961657 100644
--- a/frontend/discourse/app/lib/deprecated.js
+++ b/frontend/discourse/app/lib/deprecated.js
@@ -16,7 +16,6 @@ let emberDeprecationSilencer;
* @param {Object} [options] Deprecation options
* @param {String} [options.id] A unique identifier for this deprecation. This should be namespaced by dots (e.g. discourse.my_deprecation)
* @param {String} [options.since] The Discourse version this deprecation was introduced in
- * @param {String} [options.dropFrom] The Discourse version this deprecation will be dropped in. Typically one major version after `since`
* @param {String} [options.url] A URL which provides more detail about the deprecation
* @param {boolean} [options.raiseError] Raise an error when this deprecation is triggered. Defaults to `false`
*/
@@ -148,7 +147,7 @@ function ensureEmberDeprecationSilencer() {
* @returns {String} The formatted message
*/
function buildDeprecationMessage(msg, options, raiseError) {
- const { id, since, dropFrom, url } = options;
+ const { id, since, url } = options;
const parts = [
raiseError ? "FATAL DEPRECATION:" : "DEPRECATION NOTICE:",
msg,
@@ -157,9 +156,6 @@ function buildDeprecationMessage(msg, options, raiseError) {
if (since) {
parts.push(`[deprecated since Discourse ${since}]`);
}
- if (dropFrom) {
- parts.push(`[removal in Discourse ${dropFrom}]`);
- }
if (id) {
parts.push(`[deprecation id: ${id}]`);
}
diff --git a/frontend/discourse/app/lib/environment.js b/frontend/discourse/app/lib/environment.js
index a8b7553abc4..924271df4b0 100644
--- a/frontend/discourse/app/lib/environment.js
+++ b/frontend/discourse/app/lib/environment.js
@@ -28,7 +28,6 @@ export function isRailsTesting() {
export function isLegacyEmber() {
deprecated("`isLegacyEmber()` is now deprecated and always returns false", {
id: "discourse.is-legacy-ember",
- dropFrom: "3.0.0.beta1",
});
return false;
}
diff --git a/frontend/discourse/app/lib/formatter.js b/frontend/discourse/app/lib/formatter.js
index 633685ded3b..f34f15ebb0d 100644
--- a/frontend/discourse/app/lib/formatter.js
+++ b/frontend/discourse/app/lib/formatter.js
@@ -55,7 +55,6 @@ export function updateRelativeAge(elems) {
elems = elems.toArray();
deprecated("updateRelativeAge now expects a DOM NodeList", {
since: "2.8.0.beta7",
- dropFrom: "2.9.0.beta1",
id: "discourse.formatter.update-relative-age-node-list",
});
}
diff --git a/frontend/discourse/app/lib/icon-library.js b/frontend/discourse/app/lib/icon-library.js
index 2601132a552..57f76b45244 100644
--- a/frontend/discourse/app/lib/icon-library.js
+++ b/frontend/discourse/app/lib/icon-library.js
@@ -185,7 +185,6 @@ registerIconRenderer({
if (params.translatedtitle) {
deprecated(`use 'translatedTitle' option instead of 'translatedtitle'`, {
since: "2.9.0.beta6",
- dropFrom: "2.10.0.beta1",
id: "discourse.icon-renderer-translatedtitle",
});
params.translatedTitle = params.translatedtitle;
diff --git a/frontend/discourse/app/lib/offset-calculator.js b/frontend/discourse/app/lib/offset-calculator.js
index a3a51993975..03c92bcbf4c 100644
--- a/frontend/discourse/app/lib/offset-calculator.js
+++ b/frontend/discourse/app/lib/offset-calculator.js
@@ -9,7 +9,6 @@ export function minimumOffset() {
"The minimumOffset() helper is deprecated, please use headerOffset() instead.",
{
since: "2.8.0.beta10",
- dropFrom: "2.9.0.beta2",
id: "discourse.offset-calculator.minimumOffset",
}
);
diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjs
index 9b000e381ed..700330fcf81 100644
--- a/frontend/discourse/app/lib/plugin-api.gjs
+++ b/frontend/discourse/app/lib/plugin-api.gjs
@@ -917,7 +917,6 @@ class _PluginApi {
{
id: "discourse.add-toolbar-popup-menu-options-callback",
since: "3.2",
- dropFrom: "3.3",
}
);
diff --git a/frontend/discourse/app/lib/text.js b/frontend/discourse/app/lib/text.js
index a2c1e6bfa96..fc861555870 100644
--- a/frontend/discourse/app/lib/text.js
+++ b/frontend/discourse/app/lib/text.js
@@ -19,7 +19,6 @@ export async function cook(text, options) {
export function cookAsync(text, options) {
deprecated("cookAsync() is deprecated, call cook() instead", {
since: "3.2.0.beta2",
- dropFrom: "3.2.0.beta5",
id: "discourse.text.cook-async",
});
diff --git a/frontend/discourse/app/lib/utilities.js b/frontend/discourse/app/lib/utilities.js
index 793c42f4966..9fe5138415c 100644
--- a/frontend/discourse/app/lib/utilities.js
+++ b/frontend/discourse/app/lib/utilities.js
@@ -284,7 +284,6 @@ export function safariHacksDisabled() {
"`safariHacksDisabled()` is deprecated, it now always returns `false`",
{
since: "2.8.0.beta8",
- dropFrom: "2.9.0.beta1",
id: "discourse.safari-hacks-disabled",
}
);
diff --git a/frontend/discourse/app/models/nav-item.js b/frontend/discourse/app/models/nav-item.js
index ff884bb730d..78a8aa4353c 100644
--- a/frontend/discourse/app/models/nav-item.js
+++ b/frontend/discourse/app/models/nav-item.js
@@ -121,7 +121,6 @@ export default class NavItem extends EmberObject {
if (!args.siteSettings) {
deprecated("You must supply `buildList` with a `siteSettings` object", {
since: "2.6.0",
- dropFrom: "2.7.0",
id: "discourse.nav-item.built-list-site-settings",
});
args.siteSettings = getOwnerWithFallback(this).lookup(
diff --git a/frontend/discourse/app/models/store.js b/frontend/discourse/app/models/store.js
index ce8a9bf253f..fdcb5cbc541 100644
--- a/frontend/discourse/app/models/store.js
+++ b/frontend/discourse/app/models/store.js
@@ -6,7 +6,6 @@ deprecated(
`"discourse/models/store" import is deprecated, use "discourse/services/store" instead`,
{
since: "2.8.0.beta8",
- dropFrom: "2.9.0.beta1",
id: "discourse.models-store",
}
);
diff --git a/frontend/discourse/app/models/topic-list.js b/frontend/discourse/app/models/topic-list.js
index 18975e12559..0dfa45f4e0c 100644
--- a/frontend/discourse/app/models/topic-list.js
+++ b/frontend/discourse/app/models/topic-list.js
@@ -110,7 +110,6 @@ export default class TopicList extends RestModel {
{
id: "discourse.topic-list-find",
since: "3.1.0.beta5",
- dropFrom: "3.2.0.beta1",
}
);
diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.js
index 13850c4fb3f..cfcae9ea0fd 100644
--- a/frontend/discourse/app/models/user.js
+++ b/frontend/discourse/app/models/user.js
@@ -163,7 +163,6 @@ function userOption(userOptionKey) {
{
id: "discourse.user.userOptions",
since: "2.9.0.beta12",
- dropFrom: "3.0.0.beta1",
}
);
@@ -176,7 +175,6 @@ function userOption(userOptionKey) {
{
id: "discourse.user.userOptions",
since: "2.9.0.beta12",
- dropFrom: "3.0.0.beta1",
}
);
@@ -1270,7 +1268,6 @@ export default class User extends RestModel.extend(Evented) {
{
id: "discourse.user.resolved-timezone",
since: "2.9.0.beta12",
- dropFrom: "3.0.0.beta1",
}
);
diff --git a/frontend/discourse/app/resolver.js b/frontend/discourse/app/resolver.js
index 135166179e4..14148acd71a 100644
--- a/frontend/discourse/app/resolver.js
+++ b/frontend/discourse/app/resolver.js
@@ -36,7 +36,6 @@ const DEPRECATED_MODULES = new Map(
"app-events:main": {
newName: "service:app-events",
since: "2.4.0",
- dropFrom: "2.9.0.beta1",
},
// Deprecations below are silenced because they're in widespread use, and upgrading
// themes/plugins right now would break their compatibility with the stable branch.
@@ -44,73 +43,61 @@ const DEPRECATED_MODULES = new Map(
"store:main": {
newName: "service:store",
since: "2.8.0.beta8",
- dropFrom: "2.9.0.beta1",
silent: true,
},
"search-service:main": {
newName: "service:search",
since: "2.8.0.beta8",
- dropFrom: "2.9.0.beta1",
silent: true,
},
"key-value-store:main": {
newName: "service:key-value-store",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"pm-topic-tracking-state:main": {
newName: "service:pm-topic-tracking-state",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"message-bus:main": {
newName: "service:message-bus",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"site-settings:main": {
newName: "service:site-settings",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"capabilities:main": {
newName: "service:capabilities",
since: "3.1.0.beta4",
- dropFrom: "3.2.0.beta1",
silent: true,
},
"current-user:main": {
newName: "service:current-user",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"session:main": {
newName: "service:session",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"site:main": {
newName: "service:site",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"topic-tracking-state:main": {
newName: "service:topic-tracking-state",
since: "2.9.0.beta7",
- dropFrom: "3.0.0",
silent: true,
},
"controller:composer": {
newName: "service:composer",
since: "3.1.0.beta3",
- dropFrom: "3.2.0",
silent: true,
},
...Object.fromEntries(
@@ -172,7 +159,6 @@ export function buildResolver(baseName) {
`"${fullName}" is deprecated, use "${deprecationInfo.newName}" instead`,
{
since: deprecationInfo.since,
- dropFrom: deprecationInfo.dropFrom,
id: "discourse.resolver-resolutions",
}
);
diff --git a/frontend/discourse/app/services/header.js b/frontend/discourse/app/services/header.js
index 83570be3953..97faed82d95 100644
--- a/frontend/discourse/app/services/header.js
+++ b/frontend/discourse/app/services/header.js
@@ -39,7 +39,6 @@ export default class Header extends Service {
{
id: "discourse.header-service-topic",
since: "3.3.0.beta4-dev",
- dropFrom: "3.4.0",
}
);
diff --git a/frontend/discourse/app/services/modal.js b/frontend/discourse/app/services/modal.js
index 1d4ac38534b..a845c5f964f 100644
--- a/frontend/discourse/app/services/modal.js
+++ b/frontend/discourse/app/services/modal.js
@@ -53,7 +53,6 @@ export default class ModalService extends Service {
{
id: "discourse.modal-controllers",
since: "3.1",
- dropFrom: "3.2",
url: "https://meta.discourse.org/t/268057",
raiseError: true,
}
diff --git a/frontend/discourse/app/static/dev-tools/shared/args-table.gjs b/frontend/discourse/app/static/dev-tools/shared/args-table.gjs
index 15383201902..b4aa71f6356 100644
--- a/frontend/discourse/app/static/dev-tools/shared/args-table.gjs
+++ b/frontend/discourse/app/static/dev-tools/shared/args-table.gjs
@@ -98,13 +98,12 @@ export default class ArgsTable extends Component {
* Extracts deprecation info from a deprecated argument for display.
*
* @param {DeprecatedOutletArgument} deprecatedArg - The deprecated argument.
- * @returns {{message: string, since: string|undefined, dropFrom: string|undefined}}
+ * @returns {{message: string, since: string|undefined}}
*/
#getDeprecationInfo(deprecatedArg) {
return {
message: deprecatedArg.message,
since: deprecatedArg.options?.since,
- dropFrom: deprecatedArg.options?.dropFrom,
};
}
@@ -163,9 +162,7 @@ export default class ArgsTable extends Component {
{{#if entry.deprecationInfo.since}}
<span class="outlet-args-table__deprecation-version">
(since
- {{entry.deprecationInfo.since}}{{#if
- entry.deprecationInfo.dropFrom
- }}, removal in {{entry.deprecationInfo.dropFrom}}{{/if}})
+ {{entry.deprecationInfo.since}})
</span>
{{/if}}
</div>
diff --git a/frontend/discourse/public/assets/scripts/module-shims.js b/frontend/discourse/public/assets/scripts/module-shims.js
index 5223693a943..98d55e255ce 100644
--- a/frontend/discourse/public/assets/scripts/module-shims.js
+++ b/frontend/discourse/public/assets/scripts/module-shims.js
@@ -22,7 +22,7 @@ define("ember-addons/ember-computed-decorators", [
], function (decorators, deprecated) {
deprecated.default(
"ember-addons/ember-computed-decorators is deprecated. Use discourse/lib/decorators instead.",
- { since: "2.4", dropFrom: "3.0", id: "discourse.ember-computed-decorators" }
+ { since: "2.4", id: "discourse.ember-computed-decorators" }
);
return decorators;
});
diff --git a/frontend/discourse/select-kit/components/select-kit.js b/frontend/discourse/select-kit/components/select-kit.js
index 9947b748b6b..405c5ecb7bf 100644
--- a/frontend/discourse/select-kit/components/select-kit.js
+++ b/frontend/discourse/select-kit/components/select-kit.js
@@ -1215,7 +1215,6 @@ export default class SelectKit extends Component {
_deprecated(text) {
deprecated(text, {
since: "v2.4.0",
- dropFrom: "2.9.0.beta1",
id: "discourse.select-kit",
});
}
diff --git a/frontend/discourse/tests/helpers/create-store.js b/frontend/discourse/tests/helpers/create-store.js
index e175b3c69de..94d81e9df22 100644
--- a/frontend/discourse/tests/helpers/create-store.js
+++ b/frontend/discourse/tests/helpers/create-store.js
@@ -41,7 +41,6 @@ export default function (customLookup = () => {}) {
`,
{
since: "2.9.0.beta12",
- dropFrom: "3.1.0.beta1",
id: "discourse.create-store-helper",
}
);
diff --git a/frontend/discourse/tests/integration/components/plugin-outlet-test.gjs b/frontend/discourse/tests/integration/components/plugin-outlet-test.gjs
index f2a6c7ab8ac..2161f912540 100644
--- a/frontend/discourse/tests/integration/components/plugin-outlet-test.gjs
+++ b/frontend/discourse/tests/integration/components/plugin-outlet-test.gjs
@@ -545,7 +545,6 @@ module("Integration | Component | plugin-outlet", function (hooks) {
message="The 'shouldDisplay' is deprecated on this test"
id="discourse.plugin-connector.deprecated-arg.test"
since="3.3.0.beta4-dev"
- dropFrom="3.4.0"
)
}}
/>
@@ -582,12 +581,6 @@ module("Integration | Component | plugin-outlet", function (hooks) {
),
"logs deprecation since information"
);
- assert.true(
- this.consoleWarnStub.calledWith(
- sinon.match(/removal in Discourse 3.4.0/)
- ),
- "logs dropFrom information"
- );
});
test("silence nested deprecations", async function (assert) {
diff --git a/frontend/discourse/tests/unit/lib/deprecated-test.js b/frontend/discourse/tests/unit/lib/deprecated-test.js
index 043a4af5a9e..ad9d2838b6c 100644
--- a/frontend/discourse/tests/unit/lib/deprecated-test.js
+++ b/frontend/discourse/tests/unit/lib/deprecated-test.js
@@ -85,7 +85,6 @@ module("Unit | Utility | deprecated", function (hooks) {
test("works with all other metadata", async function (assert) {
deprecated("My message", {
id: "discourse.my_deprecation_id",
- dropFrom: "v100",
since: "v1",
url: "https://example.com",
});
@@ -97,7 +96,7 @@ module("Unit | Utility | deprecated", function (hooks) {
assert.deepEqual(
this.warnStub.args[0],
[
- "DEPRECATION NOTICE: My message [deprecated since Discourse v1] [removal in Discourse v100] [deprecation id: discourse.my_deprecation_id] [info: https://example.com]",
+ "DEPRECATION NOTICE: My message [deprecated since Discourse v1] [deprecation id: discourse.my_deprecation_id] [info: https://example.com]",
],
"console.warn is called with the correct arguments"
);
diff --git a/frontend/pretty-text/addon/pretty-text.js b/frontend/pretty-text/addon/pretty-text.js
index f6e2cd6e12c..d0ffc89f852 100644
--- a/frontend/pretty-text/addon/pretty-text.js
+++ b/frontend/pretty-text/addon/pretty-text.js
@@ -5,7 +5,6 @@ export function registerOption() {
"`registerOption() from `pretty-text` is deprecated. Use `helper.registerOptions()` instead.",
{
since: "2.8.0.beta9",
- dropFrom: "2.9.0.beta1",
id: "discourse.pretty-text.registerOption",
}
);