Skip to content
Permalink
Browse files

Update dependencies (#5206)

* Update dependencies

* Fix Faker deprecations

* Fix spec

* Add missing migration from Doorkeeper

* Always use latest Decidim Docker image

* Fix Rubocop issues

* Use Ruby grep

* Set specific names for scopes.

After debugging this for too many hours, I've concluded that if a scope
has an "s" in its name, for some reason I fail to understand, it is
escaped and represented as &#115 (which is an "s" for html entitites).
This seems to happen at browser level and I can't reproduce it otuside
the test environment.

* Remove deprecated PaperTrail config

* Don't run specs that depend on master when not on master
  • Loading branch information...
oriolgual authored and josepjaume committed Jun 22, 2019
1 parent 258f6b3 commit eb0f95a873c5fe93b9e7aaeeaed1e8b627dad49c
Showing with 513 additions and 507 deletions.
  1. +1 −1 .circleci/config.yml
  2. +1 −1 .ruby-version
  3. +3 −3 Gemfile
  4. +135 −138 Gemfile.lock
  5. +1 −1 decidim-accountability/decidim-accountability.gemspec
  6. +1 −1 decidim-admin/app/commands/decidim/admin/update_component_permissions.rb
  7. +2 −2 decidim-api/decidim-api.gemspec
  8. +2 −2 decidim-blogs/decidim-blogs.gemspec
  9. +1 −1 decidim-budgets/decidim-budgets.gemspec
  10. +1 −1 decidim-comments/decidim-comments.gemspec
  11. +2 −2 decidim-conferences/decidim-conferences.gemspec
  12. +13 −0 decidim-core/db/migrate/20190618075906_add_confidential_to_doorkeeper_application.rb
  13. +23 −23 decidim-core/decidim-core.gemspec
  14. +4 −4 decidim-core/lib/decidim/core/engine.rb
  15. +1 −1 decidim-core/lib/decidim/core/test/factories.rb
  16. +1 −1 decidim-debates/decidim-debates.gemspec
  17. +9 −9 decidim-dev/decidim-dev.gemspec
  18. +2 −2 decidim-generators/Gemfile
  19. +132 −135 decidim-generators/Gemfile.lock
  20. +2 −2 decidim-generators/lib/decidim/generators/component_templates/Gemfile.erb
  21. +9 −7 decidim-generators/spec/generators_spec.rb
  22. +6 −6 decidim-initiatives/decidim-initiatives.gemspec
  23. +3 −3 decidim-meetings/decidim-meetings.gemspec
  24. +1 −1 decidim-meetings/lib/decidim/meetings/test/factories.rb
  25. +7 −7 decidim-proposals/decidim-proposals.gemspec
  26. +2 −2 decidim-proposals/spec/commands/decidim/proposals/admin/publish_participatory_text_spec.rb
  27. +2 −2 decidim-proposals/spec/commands/decidim/proposals/admin/update_participatory_text_spec.rb
  28. +1 −1 decidim-proposals/spec/controllers/decidim/proposals_controller_spec.rb
  29. +1 −1 decidim-sortitions/decidim-sortitions.gemspec
  30. +144 −147 decidim_app-design/Gemfile.lock
@@ -4,7 +4,7 @@ defaults: &defaults
docker:
# This is the sha of the latest `decidim/decidim:latest-test` docker image. You can retrieve the
# latest digest by doing `$ docker pull decidim/decidim:latest-test`.
- image: decidim/decidim@sha256:dd56d61390f588f6d3abf192049e63ef15d43a895d06a55979da4541a649b98e
- image: decidim/decidim:latest-test
environment:
SIMPLECOV: true
DATABASE_USERNAME: postgres
@@ -1 +1 @@
2.5.3
2.6.3
@@ -9,15 +9,15 @@ gem "decidim-conferences", path: "."
gem "decidim-consultations", path: "."
gem "decidim-initiatives", path: "."

gem "bootsnap", "~> 1.3"
gem "bootsnap", "~> 1.4"

gem "puma", "~> 3.0"
gem "puma", "~> 3.12"
gem "uglifier", "~> 4.1"

gem "faker", "~> 1.9"

group :development, :test do
gem "byebug", "~> 10.0", platform: :mri
gem "byebug", "~> 11.0", platform: :mri

gem "decidim-dev", path: "."
end

0 comments on commit eb0f95a

Please sign in to comment.
You can’t perform that action at this time.