Skip to content

Commit

Permalink
Merge branch 'develop' into feature/process_groups_improvements-stats…
Browse files Browse the repository at this point in the history
…_content_block

* develop: (22 commits)
  Fix email CTA alignment on Outlook and Windows Mail (#6895)
  Fix mailer meeting registration invitation using path instead of URL (#6965)
  Fix the data portability exporter when zip is not in the gemfile (#6969)
  Convert technical docs to Antora (#6526)
  New Crowdin updates (#6957)
  Bugfix - moderated meetings are displayed in the meetings index page  (#6927)
  Add HTML Content Blocks in Process Groups  (#6823)
  Prevent error in view due to optional html not showing (#6942)
  Improve layout for standalone T&C page (#6944)
  chore: move rubocop ruby config to own file (#6952)
  Fix some strings (#6958)
  Fix newsletter html containing style tag content (#6876)
  New Crowdin updates (#6945)
  New Crowdin updates (#6926)
  Localize a string in conference speaker (#6866)
  Fix broken dashboard action logs under certain conditions (#6857)
  Fix traceability logs with invalid record (#6879)
  Allow user to drag address on proposal map (#6291)
  New Crowdin updates (#6898)
  Update release notes documentation (#6809)
  ...
  • Loading branch information
entantoencuanto committed Dec 2, 2020
2 parents 4471242 + 55d04aa commit 16b6a73
Show file tree
Hide file tree
Showing 441 changed files with 8,126 additions and 5,015 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ plugins:
- decidim-core/app/assets/javascripts/decidim/core/bundle.js.map
- decidim-core/app/assets/javascripts/decidim/core/bundle.js
- decidim-elections/lib/decidim/elections/jwk_utils.rb
- .rubocop.yml
- .rubocop_ruby.yml

grep:
enabled: true
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,3 @@ jobs:
name: Lint JS files
- run: ./.github/run_erblint.sh
name: Lint ERB files
- run: bundle exec mdl *.md docs/**/*.md
name: Lint Markdown files
Loading

0 comments on commit 16b6a73

Please sign in to comment.