Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
< 3.5.0.beta8-dev: 17909a90a9062d11e1ec9f5974e138c54a6507e4
< 3.5.0.beta5-dev: 92e29f51d5f7f8058895ceae681b0f0cfee157b2
< 3.5.0.beta1-dev: 4e42539cda9a54d7827bcdf51b6dfbcf56d24cc9
< 3.4.0.beta2-dev: 12dfb332bf830b1c8c9a24b86f5327504e9ab672
Expand Down
6 changes: 2 additions & 4 deletions assets/javascripts/discourse/components/docs-topic.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { reads } from "@ember/object/computed";
import { service } from "@ember/service";
import { classNames } from "@ember-decorators/component";
import DButton from "discourse/components/d-button";
import MountWidget from "discourse/components/mount-widget";
import PluginOutlet from "discourse/components/plugin-outlet";
import Post from "discourse/components/post";
import icon from "discourse/helpers/d-icon";
import htmlSafe from "discourse/helpers/html-safe";
import discourseDebounce from "discourse/lib/debounce";
Expand Down Expand Up @@ -71,9 +71,7 @@ export default class DocsTopic extends Component {

<div class="topic-content">
<h1>{{htmlSafe this.topic.fancyTitle}}</h1>

{{! template-lint-disable no-capital-arguments }}
<MountWidget @widget="post" @model={{this.model}} @args={{this.post}} />
<Post @post={{this.model}} />
</div>

<a class="docs-nav-link more" href="/t/{{this.topic.id}}">
Expand Down
2 changes: 1 addition & 1 deletion spec/plugin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
fab!(:category)
fab!(:topic) { Fabricate(:topic, category: category) }
fab!(:post) { Fabricate(:post, topic: topic) }
fab!(:non_docs_category) { Fabricate(:category) }
fab!(:non_docs_category, :category)
fab!(:non_docs_topic) { Fabricate(:topic, category: non_docs_category) }
fab!(:non_docs_post) { Fabricate(:post, topic: non_docs_topic) }

Expand Down
1 change: 1 addition & 0 deletions test/javascripts/acceptance/docs-user-status-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ acceptance("Docs - user status", function (needs) {
needs.site({ docs_path: "docs" });
needs.settings({
docs_enabled: true,
enable_user_status: true,
});

const mentionedUserId = 1;
Expand Down