Skip to content

Commit

Permalink
Add awesome plugin (#390)
Browse files Browse the repository at this point in the history
* add awesome

* force deploy

* deploy

* deploy

* deploy

* remove node modules after compile

* feat(task): adds import_projects_proposals_relations_csv:link_resources (#391)

* slugignore

* feat(task): adds import_projects_proposals_relations_csv:link_resources (#394)

* fix some webpacker assets

* add salavirtual.barcelona.cat as a jitsi allowed resource

* update decidim with accountability improvements and awesome fix

* update decidim with accountability improvements and cache fixes

* update decidim with accountability improvements and cache fixes

* fix backport update

* revert some buggy gems (nokogiri & truncato ?)

* order by scope code (#396)

* add rake task to extract stats from verifications from a budgets component (#397)

* fix permissions check from ephemeral mod

* deps(decidim): upgrade decidim branch custom/0.26 (#401)

* deps(decidim): upgrade decidim branch custom/0.26

* fix(lint): rubocop offenses

* fix(ci): update overrides_spec

Co-authored-by: Agusti B.R <agustibr@users.noreply.github.com>
  • Loading branch information
microstudi and agustibr authored Jun 22, 2022
1 parent f02ce4c commit 5bb4eaa
Show file tree
Hide file tree
Showing 357 changed files with 349,143 additions and 433 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
/tmp/*
!/log/.keep
!/tmp/.keep
!/tmp/2022-04-26-tracabilitat-pressupostos.csv

# Ignore Byebug command history file.
.byebug_history
Expand All @@ -33,6 +34,8 @@ node_modules
/public/packs
/public/packs-test
/node_modules
/storage/*
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.rbenv-vars
4 changes: 4 additions & 0 deletions .slugignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
spec/
*/spec/
*.md
.github
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

source "https://rubygems.org"

# DECIDIM_MAIN_BRANCH = "release/0.24-stable-bcn"
DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: "custom/0.26" }.freeze

# DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: DECIDIM_MAIN_BRANCH }.freeze

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.26-stable" }.freeze
# DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.26-stable" }.freeze
ruby RUBY_VERSION

gem "decidim", DECIDIM_VERSION
Expand All @@ -20,6 +18,7 @@ gem "decidim-stats", path: "decidim-stats"
gem "decidim-valid_auth", path: "decidim-valid_auth"

# Change term_customizer dependency to ruby-gems' when term-customizer is compatible with DECIDIM_VERSION
gem "decidim-decidim_awesome", "~> 0.8.3"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "develop"

gem "virtus-multiparams"
Expand Down Expand Up @@ -52,6 +51,7 @@ group :development do
gem "spring"
gem "spring-commands-rspec"
gem "spring-watcher-listen"
gem "web-console"
end

group :production do
Expand Down
Loading

0 comments on commit 5bb4eaa

Please sign in to comment.