Skip to content

[FIX] Place CurrentOrganization middleware before WardenManager.#4708

Merged
mrcasals merged 6 commits intomasterfrom
fix/4707-Avoid_failing_redirects_in_omniauth_strategies
Jan 8, 2019
Merged

[FIX] Place CurrentOrganization middleware before WardenManager.#4708
mrcasals merged 6 commits intomasterfrom
fix/4707-Avoid_failing_redirects_in_omniauth_strategies

Conversation

@tramuntanal
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal commented Dec 20, 2018

🎩 What? Why?

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG entry
  • [-] Add documentation regarding the feature
  • [-] Add/modify seeds
  • [-] Add tests
  • Fix

@tramuntanal tramuntanal self-assigned this Dec 20, 2018
@ghost ghost added the status: WIP label Dec 20, 2018
oriolgual
oriolgual previously approved these changes Dec 20, 2018
@tramuntanal
Copy link
Copy Markdown
Contributor Author

May this PR be merged into v0.16?
I'm waiting to add the Changelog entry to avoid merge problems.

@oriolgual
Copy link
Copy Markdown
Contributor

@tramuntanal I'm afraid you'll have to submit another one for 0.16-stable

@tramuntanal
Copy link
Copy Markdown
Contributor Author

@aitorlb would you backport this PR into 16-stable please?

aitorlb added a commit that referenced this pull request Dec 28, 2018
@ghost ghost assigned aitorlb Dec 28, 2018
@ghost ghost added the status: WIP label Dec 28, 2018
@aitorlb aitorlb mentioned this pull request Dec 28, 2018
1 task
@tramuntanal
Copy link
Copy Markdown
Contributor Author

Ok @oriolgual , we'll do this for v0.17 and a backport to v0.16.
Can you notify us when master is stable please

@ghost ghost assigned mrcasals Jan 4, 2019
@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 4, 2019

@tramuntanal master should be fixed on #4726

@tramuntanal
Copy link
Copy Markdown
Contributor Author

Hi @mrcasals thanks but it seems that master is still broken

@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 7, 2019

@tramuntanal can you rebase this PR (and the rest of them)? Those weird errors have already been solved at #4730 and #4731 😄

@tramuntanal
Copy link
Copy Markdown
Contributor Author

tramuntanal commented Jan 7, 2019

@mrcasals yes, but I see here that master is not green. If I merge tests will fail again (probably for some other reason).

@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Jan 7, 2019

@tramuntanal The status checks this page shows for master are actually for l10n_master, for some reason unknown to me. Here are the latest builds for master:

https://circleci.com/gh/decidim/workflows/decidim/tree/master

…' of ssh://github.com/decidim/decidim into fix/4707-Avoid_failing_redirects_in_omniauth_strategies
@ghost ghost added the status: WIP label Jan 7, 2019
@tramuntanal
Copy link
Copy Markdown
Contributor Author

@mrcasals master is now green! 👏

@tramuntanal
Copy link
Copy Markdown
Contributor Author

@decidim/lot-core All checks have passed!

@mrcasals mrcasals merged commit 8351f60 into master Jan 8, 2019
@mrcasals mrcasals deleted the fix/4707-Avoid_failing_redirects_in_omniauth_strategies branch January 8, 2019 08:02
mrcasals pushed a commit that referenced this pull request Jan 8, 2019
* Backport #4708 to 16-stable

* Add CHANGELOG entry
moustachu added a commit to OpenSourcePolitics/decidim that referenced this pull request Feb 8, 2019
* fix display of comments count when comment has been moderated

* [BACKPORT] Use latest docker image for test env (decidim#4731)

* Use latest docker image for test env

* Bump Ruby version to match the one in tests

* Fix conferences dependencies

* Fix bundle version

* Fix bundles

* Backport decidim#4708 to 0.16-stable (decidim#4721)

* Backport decidim#4708 to 16-stable

* Add CHANGELOG entry

* Add ability to toggle user groups by organization (decidim#4681) (decidim#4735)

* Added a switch to organizations to disable user groups feature

* Set user_groups_enabled attribute value in admin and system admin

Default value is true, and can be modified by admins.

* User groups methods moved to a new concern from UserProfile

* Disable user groups when on core user pages

* Disable user_groups on amendments

* Disable user groups on admin

* Disable user groups on proposals

* Add changelog entry

* [BACKPORT] MetricResolver filtering correction (decidim#4736)

* [BACKPORT] MetricResolver filtering correction

* Added CHANGELOG entry

* Fix loading translations on comments (decidim#4728) (decidim#4739)

This way they won't fail when there's a problem

* New Crowdin translations (decidim#4738)

* New translations en.yml (German)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (German)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Basque)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Italian)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Polish)

* New translations en.yml (Italian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Basque)

* New translations en.yml (Galician)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Catalan)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Dutch)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (French)

* New translations en.yml (Finnish)

* New translations en.yml (Dutch)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Swedish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Turkish)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Ukrainian with many plural form)

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Finnish (plain))

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Russian with many plural form)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Portuguese)

* New translations en.yml (Spanish)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Swedish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

* Update bundles

* 🐛 current_feature deprecated

* Adds environment to open data export task to avoid errors (decidim#4743)

* 🌐 FR --> Concertations #378

* 🌐 FR --> Concertations #378

* 🌐 FR --> Concertations #378

* Fix action authorizer with blank permissions 0.16 backport (decidim#4746)

* Ignore blank permission options in action authorizer

* Add CHANGELOG

* 🐛 #417 : fix exports translatable_attr when first line is empty

- add `empty_translatable` helper to provide blank values
- fix `Decidim::Proposals::ProposalSerializer`
- fix `Decidim::Comments::CommentSerializer`
- fix `Decidim::Accountability::ResultSerializer`
- TODO : need specific tests on headers

* :robot: rubocop offense `C: Style/StringLiterals`

* :bug: #360 fix survey choices export for free text option

* ✨ #216 Survey answer date

* ✨ #226 Survey answer date

* 🤖

* 🐛 #421 fix Proposal mention links

- only replace link when url contains "proposals" path
- prevent switching between components with same item id

* ✨ add mentions for Accountibility Results

- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ResultPresenter`

* ✨ add mentions for Budgets Projects

- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ProjectPresenter`

* ✅ fix tests for content parser

* Backport decidim#4778 to 0.16-stable (decidim#4777)

* Move code parent assemblies from index to partial

* Refactor filtered assemblies query

* Refactor filter assemblies helper and partial

* Change tests

* Add CHANGELOG entry

* 🐛 fixes #344 for `NotifyProposalsMentionedJob`

* 🐛 fixes #344 for `NotifyProposalsMentionedJob`

* 🤖 rubocop #344

* ✅ fixes tests for #344

* 🤖 rubocop

* Backport participatory text related evoutives and fixes. (decidim#4801)

* Backport participatory text related evoutives and fixes.

* Add changelog entry.

* Update decidim_app-design Gemfile.lock.

* Update decidim-generators Gemfile.lock.

* Sort this PR's changelog entries for the next v0.16.1.

* [TEST] Update participatory_text.odt document version with non ASCII symbols.

* Backport decidim#4811 to 0.16-stable (decidim#4815)

* Fix attachments not being inherited and add test

* Add CHANGELOG entry

* 🐛 fixes Pagination in assemblies #459

* 🐛 ✉️ add opt out notifications mail link

- #RGPD

* 🐛 unused keys

* 🐛 💚 test_main

* 🐛 💚 test_main

* 🌐 💚 after patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants