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

Jump to bottom

fix: Fix conflicts with master #58

Merged
merged 4 commits into from
Nov 28, 2023
Merged

fix: Fix conflicts with master #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e12692
fix: conflicts
Quentinchampenois Nov 27, 2023
c858a68
fix: Add x86_64-linux support in Gemfile.lock
Quentinchampenois Nov 27, 2023
620d10b
revert: Module slider
Quentinchampenois Nov 27, 2023
b2d7f4f
fix: Add yarn dependencies
Quentinchampenois Nov 27, 2023
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
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ gem "decidim", "~> #{DECIDIM_VERSION}.0"

# External Decidim gems
gem "decidim-cache_cleaner"
gem "decidim-decidim_awesome"
gem "decidim-decidim_awesome", "0.8.3"
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
gem "decidim-spam_detection"
gem "decidim-term_customizer", git: "https://github.com/opensourcepolitics/decidim-module-term_customizer.git", branch: "fix/multi-threading-compliant-0.26"

# Omniauth gems
gem "decidim-slider", git: "https://github.com/alecslupu-pfa/decidim-module-slider", branch: "main"
# gem "decidim-slider", git: "https://github.com/alecslupu-pfa/decidim-module-slider", branch: "main"
gem "omniauth-publik", git: "https://github.com/OpenSourcePolitics/omniauth-publik"

# Default
Expand Down
59 changes: 21 additions & 38 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ GIT
omniauth (~> 2.0)
omniauth-oauth2 (>= 1.7.2, < 2.0)

GIT
remote: https://github.com/alecslupu-pfa/decidim-module-slider
revision: 63e29e03b2bc300f4941a079ecb993cab006e254
branch: main
specs:
decidim-slider (0.0.3)
decidim-core (~> 0.26.0)

GIT
remote: https://github.com/opensourcepolitics/decidim-module-term_customizer.git
revision: f5208f3cad23cb68e502e77cb0d2d3d441d09e40
Expand Down Expand Up @@ -114,23 +106,23 @@ GEM
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.852.0)
aws-sdk-core (3.186.0)
aws-eventstream (1.3.0)
aws-partitions (1.857.0)
aws-sdk-core (3.188.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.72.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sdk-kms (1.73.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.136.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-s3 (1.140.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.1)
aws-sigv4 (1.7.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.4.1)
axe-core-api (4.7.0)
dumb_delegator
virtus
axe-core-rspec (4.1.0)
Expand All @@ -143,7 +135,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
batch-loader (1.5.0)
bcrypt (3.1.19)
bcrypt (3.1.20)
better_html (1.0.16)
actionview (>= 4.0)
activesupport (>= 4.0)
Expand Down Expand Up @@ -322,7 +314,6 @@ GEM
decidim-decidim_awesome (0.8.3)
decidim-admin (>= 0.25.0, < 0.27)
decidim-core (>= 0.25.0, < 0.27)
deface (>= 1.5)
sassc (~> 2.3)
decidim-dev (0.26.8)
axe-core-rspec (~> 4.1.0)
Expand Down Expand Up @@ -396,12 +387,6 @@ GEM
declarative-builder (0.1.0)
declarative-option (< 0.2.0)
declarative-option (0.1.0)
deface (1.9.0)
actionview (>= 5.2)
nokogiri (>= 1.6)
polyglot
railties (>= 5.2)
rainbow (>= 2.1.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.9.3)
Expand All @@ -421,7 +406,7 @@ GEM
nokogiri (>= 1.13.2, < 1.15.0)
rubyzip (~> 2.3.0)
docile (1.4.0)
doorkeeper (5.6.6)
doorkeeper (5.6.7)
railties (>= 5)
doorkeeper-i18n (4.0.1)
dotenv (2.8.1)
Expand Down Expand Up @@ -452,7 +437,7 @@ GEM
railties (>= 3.0.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
faraday (2.7.11)
faraday (2.7.12)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
Expand Down Expand Up @@ -581,7 +566,7 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
mustache (1.1.1)
net-imap (0.4.5)
net-imap (0.4.6)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -590,7 +575,7 @@ GEM
timeout
net-smtp (0.4.0)
net-protocol
nio4r (2.6.0)
nio4r (2.6.1)
nokogiri (1.13.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.4-x86_64-linux)
Expand Down Expand Up @@ -645,7 +630,6 @@ GEM
pg_search (2.3.6)
activerecord (>= 5.2)
activesupport (>= 5.2)
polyglot (0.3.5)
premailer (1.21.0)
addressable
css_parser (>= 1.12.0)
Expand All @@ -654,7 +638,7 @@ GEM
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
public_suffix (5.0.3)
public_suffix (5.0.4)
puma (5.6.7)
nio4r (~> 2.0)
raabro (1.4.0)
Expand Down Expand Up @@ -806,13 +790,13 @@ GEM
semantic_range (3.0.0)
sendgrid-ruby (6.6.2)
ruby_http_client (~> 3.4)
sentry-rails (5.13.0)
sentry-rails (5.14.0)
railties (>= 5.0)
sentry-ruby (~> 5.13.0)
sentry-ruby (5.13.0)
sentry-ruby (~> 5.14.0)
sentry-ruby (5.14.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
sentry-sidekiq (5.13.0)
sentry-ruby (~> 5.13.0)
sentry-sidekiq (5.14.0)
sentry-ruby (~> 5.14.0)
sidekiq (>= 3.0)
seven_zip_ruby (1.3.0)
sidekiq (6.5.12)
Expand Down Expand Up @@ -927,10 +911,9 @@ DEPENDENCIES
dalli
decidim (~> 0.26.0)
decidim-cache_cleaner
decidim-decidim_awesome
decidim-decidim_awesome (= 0.8.3)
decidim-dev (~> 0.26.0)
decidim-homepage_interactive_map!
decidim-slider!
decidim-spam_detection
decidim-term_customizer!
dotenv-rails
Expand Down
Loading
Loading