Skip to content

Commit 4bb16fa

Browse files
committed
Use patched version of deface for decidim-geo
1 parent d50595f commit 4bb16fa

2 files changed

Lines changed: 27 additions & 12 deletions

File tree

Gemfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ gem 'decidim',
1212
branch: '0.29-backports',
1313
ref: '7928d98'
1414

15+
# HACK: Using patched version of deface, to fix decidim-geo JS Errors
16+
gem 'deface',
17+
git: 'https://github.com/froger/deface',
18+
branch: 'fix/js-overrides'
19+
1520
# Internal Modules
1621
gem 'decidim-proposals', DECIDIM_VERSION
1722
# gem 'decidim-consultations', DECIDIM_VERSION
@@ -38,8 +43,7 @@ gem 'decidim-decidim_awesome',
3843
ref: 'f2c7152'
3944
gem 'decidim-decidim_geo',
4045
git: 'https://git.octree.ch/decidim/decidim-module-geo',
41-
branch: 'main',
42-
ref: '3bc7e260'
46+
tag: 'v0.3.4'
4347
gem 'decidim-guest_meeting_registration',
4448
github: 'OpenSourcePolitics/guest-meeting-registration',
4549
branch: 'bump/module_to_0.29',

Gemfile.lock

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
GIT
22
remote: https://git.octree.ch/decidim/decidim-module-geo
3-
revision: 3bc7e260bef729172975412b9ff648215f0e3713
4-
ref: 3bc7e260
5-
branch: main
3+
revision: 1185dc1b672441f3a6421a7e64ee68deab3a92bf
4+
tag: v0.3.4
65
specs:
7-
decidim-decidim_geo (0.3.3)
6+
decidim-decidim_geo (0.3.4)
87
activerecord-postgis-adapter
98
decidim-admin (>= 0.29)
109
decidim-api (>= 0.29)
@@ -61,6 +60,22 @@ GIT
6160
deface (>= 1.5)
6261
sassc (~> 2.3)
6362

63+
GIT
64+
remote: https://github.com/froger/deface
65+
revision: fe80c6bc7166d3adb5e99a5ab46a81138f52840a
66+
branch: fix/js-overrides
67+
specs:
68+
deface (1.9.0)
69+
actionview (>= 7.0)
70+
base64
71+
bigdecimal
72+
drb
73+
mutex_m
74+
nokogiri (>= 1.6)
75+
polyglot
76+
railties (>= 7.0)
77+
rainbow (>= 2.1.0)
78+
6479
GIT
6580
remote: https://github.com/netsphere-labs/omniauth-openid-connect
6681
revision: b13c5ba73999566ce61bdd1c6c41d335f23fe863
@@ -470,12 +485,6 @@ GEM
470485
declarative-builder (0.2.0)
471486
trailblazer-option (~> 0.1.0)
472487
declarative-option (0.1.0)
473-
deface (1.9.0)
474-
actionview (>= 5.2)
475-
nokogiri (>= 1.6)
476-
polyglot
477-
railties (>= 5.2)
478-
rainbow (>= 2.1.0)
479488
delayed_cron_job (0.9.0)
480489
fugit (>= 1.5)
481490
delayed_job (4.1.13)
@@ -504,6 +513,7 @@ GEM
504513
railties (>= 5)
505514
doorkeeper-i18n (4.0.1)
506515
dotenv (3.1.8)
516+
drb (2.2.3)
507517
erb_lint (0.4.0)
508518
activesupport
509519
better_html (>= 2.0.1)
@@ -1111,6 +1121,7 @@ DEPENDENCIES
11111121
decidim-survey_multiple_answers!
11121122
decidim-templates (= 0.29.5)
11131123
decidim-term_customizer!
1124+
deface!
11141125
delayed_cron_job
11151126
delayed_job_active_record
11161127
dotenv

0 commit comments

Comments
 (0)