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.

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

PB05 #1

Merged
merged 14 commits into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
source "https://rubygems.org"

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.24-stable" }
FEATURE_BRANCHES = {
pb04: "feature/pb04-budget-scope-list",
pb05: "feature/pb05-alt"
}.freeze

DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: FEATURE_BRANCHES[:pb05] }.freeze

ruby '2.7.2'

Expand Down
22 changes: 15 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GIT
remote: https://github.com/AjuntamentdeBarcelona/decidim
revision: 553b70ac2fa20a0d88d9c61543873bbf97542cc5
branch: feature/bcn-budget-v0.24
revision: 501698dfc85a7d5f6a3e7b7a35dbe882283e3780
branch: feature/pb05-alt
specs:
decidim (0.24.2)
decidim-accountability (= 0.24.2)
Expand Down Expand Up @@ -217,6 +217,14 @@ GIT
decidim-verifications (0.24.2)
decidim-core (= 0.24.2)

GIT
remote: https://github.com/CodiTramuntana/decidim-module-term_customizer
revision: c4ed0ffa87bd9977c6b470aa815d5dc2ed9f88a5
specs:
decidim-term_customizer (0.18.0)
decidim-admin (>= 0.18.0)
decidim-core (>= 0.18.0)

PATH
remote: decidim-dataviz
specs:
Expand Down Expand Up @@ -344,7 +352,7 @@ GEM
actionpack (>= 3.0)
cells (>= 4.1.6, < 5.0.0)
charlock_holmes (0.7.7)
chef-utils (17.0.242)
chef-utils (17.1.35)
concurrent-ruby
childprocess (3.0.0)
coercible (1.0.0)
Expand Down Expand Up @@ -402,7 +410,7 @@ GEM
doc2text (0.4.3)
nokogiri (~> 1.11.1)
rubyzip (~> 2.3.0)
docile (1.3.5)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.5.1)
Expand Down Expand Up @@ -495,7 +503,7 @@ GEM
graphiql-rails (1.4.11)
railties
sprockets-rails
graphql (1.12.9)
graphql (1.12.10)
hashdiff (1.0.1)
hashie (4.1.0)
highline (2.0.3)
Expand Down Expand Up @@ -645,7 +653,7 @@ GEM
activerecord (>= 5.2)
activesupport (>= 5.2)
polyglot (0.3.5)
premailer (1.14.3)
premailer (1.15.0)
addressable
css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
Expand Down Expand Up @@ -883,7 +891,7 @@ GEM
virtus (~> 1.0)
warden (1.2.9)
rack (>= 2.0.9)
webmock (3.12.2)
webmock (3.13.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand Down
3 changes: 3 additions & 0 deletions config/locales/ca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ ca:
progress: Finalitza la votació
show: Veure més
vote: Vota
projects:
budget_summary:
vote: Vota
census16_authorization_handler:
document_types:
dni: DNI
Expand Down
3 changes: 3 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ es:
progress: Finaliza la votación
show: Ver más
vote: Vota
projects:
budget_summary:
vote: Vota
census16_authorization_handler:
document_types:
dni: DNI
Expand Down