Skip to content

Add versioning pages to initiatives#5935

Closed
ace wants to merge 10 commits intodecidim:developfrom
aspgems:feature/add_versioning_to_initiatives
Closed

Add versioning pages to initiatives#5935
ace wants to merge 10 commits intodecidim:developfrom
aspgems:feature/add_versioning_to_initiatives

Conversation

@ace
Copy link
Copy Markdown
Contributor

@ace ace commented Apr 7, 2020

🎩 What? Why?

Add versioning pages to initiatives

📋 Subtasks

  • Add CHANGELOG entry
  • Add tests

📷 Screenshots (optional)

Versioning info on initiative page

Versions page

Version page, unified diff

Version page, side-by-side diff

@ace ace marked this pull request as ready for review April 9, 2020 14:50
@ace ace changed the title WIP: Add versioning pages to initiatives Add versioning pages to initiatives Apr 20, 2020
@ace ace force-pushed the feature/add_versioning_to_initiatives branch from ed6c946 to 87ef2df Compare April 22, 2020 16:44
@virgile-dev
Copy link
Copy Markdown
Contributor

Hello, @tramuntanal @carolromero this ready to be reviewed and merged :)

@carolromero
Copy link
Copy Markdown
Member

@virgile-dev that's ok from @decidim/product, thanks!

@tramuntanal tramuntanal self-assigned this Apr 29, 2020
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ace good job here!

I just see that we don't want to to add more dependencies to decidim-core, even if these are test dependencies.
The ones that we have now are accidental. Check my comments, we can discuss it if you have any question

require "decidim/meetings/test/factories"
require "decidim/accountability/test/factories"
require "decidim/system/test/factories"
require "decidim/initiatives/test/factories"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to add this dependecy to decidim core?
Our objective is to get rid of accountability and meetings not to add more dependencies 😄

context "when diffing a translatable attribute that has empty strings" do
let(:title) { { en: "English title", ca: "Catalan title", es: "" } }
let(:item) { create(:result, title: title) }
let(:item) { create(:initiative, title: title) }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should extract an example and include it in a spec in initiatives please

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm removing both changes above. They were mostly me trying to 'fix' a red in CI coverage tasks that was not really because of the changes.

Andrés Cirugeda and others added 2 commits April 29, 2020 12:33
Co-Authored-By: Oliver Valls <tramuntanal@gmail.com>
tramuntanal added a commit that referenced this pull request Apr 30, 2020
* Add versioning pages to initiatives

* Add specs for versioning pages

* Add CHANGELOG entry

* Normalize i18n file (hopefully)

* Use initiatives in diff cell test to test if branch in diff renderer class detection

* Remove unrelated lines from Changelog

* Undo changes on core
@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Apr 30, 2020

This PR was squashed and merged to develop via 2837e199db156cbc698501097e1bf0ad29b867ec

ace pushed a commit to aspgems/decidim that referenced this pull request May 5, 2020
* develop: (29 commits)
  Update Conversations design with decidim-design UI (decidim#6008)
  Add counter of active users to admin dashboard (decidim#5907)
  Show activity graphs on admin dashboard (decidim#6030)
  Update sassc gem version (decidim#6062)
  Fix generator Gemfile after puma upgrade (decidim#6060)
  New Crowdin translations (decidim#6059)
  Add Slovak as a new language (decidim#6039)
  Remove all tests for i18n PRs (decidim#6061)
  Update move up and down buttons after dragging questions when managing questionnaire (decidim#5947)
  Fix using Decidim as a provider for omniauth authentication (decidim#6042)
  Add redesign for responsive public profile navigation tabs (decidim#6032)
  Add versioning pages to initiatives (decidim#5935)
  Notify users when roles get assigned (decidim#5886)
  Improve the budget page and the project card (decidim#5809)
  New Crowdin translations (decidim#6050)
  New Crowdin translations (decidim#6046)
  Ignore jobs on locales branches (decidim#6047)
  Automatic task for deleting Meeting Inscription data (decidim#5989)
  New Crowdin translations (decidim#5877)
  Ignore builds on Crowdin PRs (decidim#6037)
  ...
@ace ace deleted the feature/add_versioning_to_initiatives branch May 26, 2020 09:42
@ace ace restored the feature/add_versioning_to_initiatives branch May 26, 2020 09:42
@ace ace deleted the feature/add_versioning_to_initiatives branch May 26, 2020 09:42
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