Skip to content

Commit

Permalink
Merge pull request #114 from diputacioBCN/fix/index_only_organization…
Browse files Browse the repository at this point in the history
…_conflicts

Get "Show only current organization in verification conflicts with multitenants"
  • Loading branch information
laurajaime authored Mar 22, 2022
2 parents 508160a + 2cb9ec4 commit e05d2ae
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/CodiTramuntana/decidim.git
revision: ca37a35f4e378f29da254045765f7a45b991291c
revision: 69b6f6c356b3c24a07e515c7cf156b0e72e7350b
branch: release/0.24-stable
specs:
decidim (0.24.3)
Expand Down Expand Up @@ -331,7 +331,7 @@ GEM
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
batch-loader (1.5.0)
bcrypt (3.1.16)
bcrypt (3.1.17)
better_html (1.0.16)
actionview (>= 4.0)
activesupport (>= 4.0)
Expand Down Expand Up @@ -471,7 +471,7 @@ GEM
rest-client (>= 1.6)
eventmachine (1.2.7)
eventmachine_httpserver (0.2.1)
excon (0.91.0)
excon (0.92.1)
execjs (2.8.1)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -509,13 +509,13 @@ GEM
fugit (1.5.2)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.4)
geocoder (1.7.3)
geocoder (1.7.5)
globalid (1.0.0)
activesupport (>= 5.0)
graphiql-rails (1.4.11)
railties
sprockets-rails
graphql (1.13.10)
graphql (1.13.11)
gyoku (1.3.1)
builder (>= 2.1.2)
hashdiff (1.0.1)
Expand Down Expand Up @@ -570,7 +570,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kramdown (2.3.1)
kramdown (2.3.2)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
Expand Down Expand Up @@ -663,7 +663,7 @@ GEM
paper_trail (10.3.1)
activerecord (>= 4.2)
request_store (~> 1.1)
parallel (1.21.0)
parallel (1.22.0)
parser (3.1.1.0)
ast (~> 2.4.1)
pg (1.1.4)
Expand Down Expand Up @@ -906,12 +906,12 @@ GEM
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8.1)
unicode-display_width (1.8.0)
valid_email2 (2.3.1)
activemodel (>= 3.2)
mail (~> 2.5)
vcr (6.0.0)
vcr (6.1.0)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
Expand Down

0 comments on commit e05d2ae

Please sign in to comment.