Skip to content

Commit

Permalink
Upgrade 0.27 (#18)
Browse files Browse the repository at this point in the history
* Upgrade decidim-peertube

* Upgrade to decidim 0.25

* Add new queues

* Update legacy migration

* Update workflows

* Update docker

* Update rubocop.yml

* Webpacker migration

* Lint

* Fix test workflow

* Update Gemfile

* Upgrade 0.26

* Upgrade 0.27

* fix decidim.rb here_maps

* fix: rubocop fixes

* fix: rubocop fixes

* fix: update .ruby-version

* fix: social_crowfunding gem branch fix

* fix: packages deleted

* fix: package-lock.json

* fix: docker images updated, fix package.json and new package-lock.json

* fix: social_crowfunding module branch fixed

* delete idea files

* fix: peertube module fixed to version 0.27 and higher

* fix: gemfile.lock with updated peertube module versions

* Change task to delete data portability files

* Upgrade decidim-module-social_crowdfunding

* feat: peertube module deleted and added as a gem

* fix: required peertube factories removed from decidim-plataformess

* fix: gem peertube branch fixed

---------

Co-authored-by: Francisco Bolívar <francisco.bolivar@nazaries.com>
  • Loading branch information
apuertadelaguila and fblupi authored May 31, 2023
1 parent 4b43491 commit c3d9ed5
Show file tree
Hide file tree
Showing 275 changed files with 167,295 additions and 10,761 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1

jobs:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,6 @@ node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

public/sw.js
public/sw.js.map
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.0.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM decidim/decidim:0.24.3
FROM decidim/decidim:0.27.2
9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
source "https://rubygems.org"

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

gem "decidim", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-decidim_awesome", "~> 0.8"
gem "decidim-social_crowdfunding", git: "https://github.com/Platoniq/decidim-module-social_crowdfunding", branch: DECIDIM_BRANCH
gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "main"
gem "decidim-social_crowdfunding", git: "https://github.com/Platoniq/decidim-module-social_crowdfunding", branch: "main"
# gem "decidim-consultations", DECIDIM_VERSION
# gem "decidim-elections", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION
# gem "decidim-templates", DECIDIM_VERSION

# gem "decidim-peertube", git: "https://github.com/Platoniq/decidim-plataformess.git", branch: "feature/peertube"
gem "decidim-decidim_peertube", path: "./decidim-peertube"
gem "decidim-peertube", git: "https://github.com/Platoniq/decidim-module-peertube", branch: "main"

gem "bootsnap", "~> 1.4"

Expand Down
Loading

0 comments on commit c3d9ed5

Please sign in to comment.