Skip to content

Commit

Permalink
Merge branch 'main' of github.com:discourse/discourse-calendar into d…
Browse files Browse the repository at this point in the history
…iscourse-main
  • Loading branch information
Alan-Liang committed Aug 10, 2024
2 parents 0395d38 + 8491b76 commit 9d2ab33
Show file tree
Hide file tree
Showing 417 changed files with 26,391 additions and 7,553 deletions.
10 changes: 10 additions & 0 deletions .discourse-compatibility
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
< 3.4.0.beta1-dev: 908ad614bc412f831f929ca726a4bda0b9ccaab6
< 3.3.0.beta2-dev: 455eeed541a9b5cacf627349e543028427178a44
< 3.3.0.beta1-dev: 84ef46a38cf02748ecacad16c5d9c6fec12dc8da
< 3.2.0.beta3-dev: 513a92b59dd80e79cc39fe6d8eb084ce7f5db5a7
< 3.2.0.beta2: 6222eec8fc0e61971f4fa4939b39cf9247201c33
3.1.0.beta3: 10077ca904956005f9fa83c3d9fb124b59e8c47b
2.9.0.beta13: b4c366b35d6f9778e54a878aa083348e8a45e86e
2.9.0.beta9: 6f16ae10dc0306d6e1369e0d1414416d7e72141d
2.9.0.beta7: ec34a96f215dce9c7321dfe04f6dd0172a197711
2.9.0.beta3: 9ab1b76a1425304f3434b49db49cb4eec8919cf6
2.7.0.beta3: 52e22b9972dc79c67f6a2f7c4c9f918307222030
3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

1 change: 1 addition & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/eslint");
11 changes: 11 additions & 0 deletions .github/workflows/discourse-plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Discourse Plugin

on:
push:
branches:
- main
pull_request:

jobs:
ci:
uses: discourse/.github/.github/workflows/discourse-plugin.yml@v1
57 changes: 0 additions & 57 deletions .github/workflows/plugin-linting.yml

This file was deleted.

156 changes: 0 additions & 156 deletions .github/workflows/plugin-tests.yml

This file was deleted.

8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.DS_Store
gems/
/node_modules
.on-save.json
node_modules
yarn-error.log
.rubocop-https---raw-githubusercontent-com-discourse-*
/gems
/auto_generated
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
assets/stylesheets/vendor/*.scss
public/
1 change: 0 additions & 1 deletion .prettierrc

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/prettier");
6 changes: 5 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
inherit_gem:
rubocop-discourse: default.yml
rubocop-discourse: stree-compat.yml
AllCops:
Exclude:
- vendor/**/*
- gems/**/*
3 changes: 3 additions & 0 deletions .streerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--print-width=100
--plugins=plugin/trailing_comma,plugin/disable_auto_ternary
--ignore-files=vendor/*
1 change: 1 addition & 0 deletions .template-lintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require("@discourse/lint-configs/template-lint");
4 changes: 0 additions & 4 deletions .template-lintrc.js

This file was deleted.

5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"

group :development do
gem 'rubocop-discourse'
gem "rubocop-discourse"
gem "syntax_tree"
end
Loading

0 comments on commit 9d2ab33

Please sign in to comment.