Commit 72b643c

committed

Merge topics feature

Admins now have a way to merge topics together, to manually fix issues where a thread is split into multiple for some reason.

1 parent e67630e commit 72b643cCopy full SHA for 72b643c

25 files changed

+1511

-1

lines changed

app
- assets/stylesheets
  - application.postcss.css
  - components
    - admin-merge.css
- controllers
  - admin
    - base_controller.rb
    - topic_merges_controller.rb
  - topics_controller.rb
- models
- services
  - topic_merge_service.rb
- views
  - admin/topic_merges
  - topics
    - show.html.slim
config
- routes.rb
db
- migrate
- schema.rb
spec
- factories
- models
- services
  - topic_merge_service_spec.rb

25 files changed

+1511

-1

lines changed

`‎app/assets/stylesheets/application.postcss.css‎`

-Original file line number
+Diff line change
 @import "components/stats.css";
 @import "components/reports.css";
 @import "components/help.css";
 +@import "components/admin-merge.css";

Comments

(0)