Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to [email protected] #52

Merged
merged 11 commits into from
Nov 4, 2020
Merged

Update to [email protected] #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2840892
Update to [email protected]
mllocs Oct 27, 2020
e7f1d5c
Used github decidim 0.22-stable instead
mllocs Oct 28, 2020
73644c4
Use direct verifications coopdevs fork with [email protected] branch
mllocs Nov 2, 2020
d50852f
Pull from decidim stable branch
mllocs Nov 2, 2020
74d59b9
Update decidim-direct_verifications
mllocs Nov 2, 2020
a267d17
Updated decidim-direct_verifications
mllocs Nov 3, 2020
5d9877c
Merge branch 'master' into feature/decidim-0.22
mllocs Nov 3, 2020
108b255
Update commits from both dependencies
sauloperez Nov 3, 2020
d7d8b65
Toggle force_ssl depending on ENV var
sauloperez Nov 4, 2020
6d798ed
Use branch with backport
sauloperez Nov 4, 2020
54a3b08
Revert back to action_delegator's master branch
sauloperez Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "decidim", "0.21.0"
gem "decidim-consultations", "0.21.0"
DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim", tag: "backport/6775_to_release/0.22-stable" }

gem "decidim", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION

gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator"
gem "decidim-direct_verifications", github: "Platoniq/decidim-verifications-direct_verifications", branch: "devel"
gem "decidim-direct_verifications", github: "coopdevs/decidim-verifications-direct_verifications", branch: "feature/decidim-0.22"

gem "bootsnap", "~> 1.3"

Expand All @@ -21,7 +23,7 @@ gem "faker", "~> 1.9"
group :development, :test do
gem "byebug", "~> 11.0", platform: :mri

gem "decidim-dev", "0.21.0"
gem "decidim-dev", "0.22.0"
end

group :development do
Expand Down
Loading