Skip to content

Add Docker support#19

Merged
oriolgual merged 7 commits intomasterfrom
docker
Sep 28, 2016
Merged

Add Docker support#19
oriolgual merged 7 commits intomasterfrom
docker

Conversation

@beagleknight
Copy link
Copy Markdown
Contributor

@beagleknight beagleknight commented Sep 26, 2016

What and why

As requested here #14, I added Docker for decidim base gem and for new applications generated with it.

QA

Generate a new application using the gem or running it through docker like docker-compose run --rm decidim --edge new_app.
Run the following commands:

  • docker-compose build : Build the app image
  • docker-compose run --rm app bundle exec rake db:create db:migrate: Create and migrate database
  • docker-compose up: Launch all the services.

Visit http://localhost:3000.

GIF Tax

@codecov-io
Copy link
Copy Markdown

codecov-io commented Sep 26, 2016

Current coverage is 95.73% (diff: 100%)

Merging #19 into master will not change coverage

@@             master        #19   diff @@
==========================================
  Files            73         73          
  Lines           656        656          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits            628        628          
  Misses           28         28          
  Partials          0          0          

Powered by Codecov. Last update a040342...544909b

Copy link
Copy Markdown
Contributor

@josepjaume josepjaume left a comment

Choose a reason for hiding this comment

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

@beagleknight maybe you could integrate the QA steps into the Readme?

@beagleknight
Copy link
Copy Markdown
Contributor Author

@josepjaume Sure but... can I add some templating to the README? 😮

@josepjaume
Copy link
Copy Markdown
Contributor

Oh right! I was referring to the gem's README, but you're right - this should go to the project's Readme instead. We can do it later on, but it should be done at some point.

encoding: unicode
# For details on connection pooling, see rails configuration guide
# http://guides.rubyonrails.org/configuring.html#database-pooling
pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
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.

Well done!

# To create additional roles in postgres see `$ createuser --help`.
# When left blank, postgres will use the default role. This is
# the same name as the operating system user that initialized the database.
#username: <%= app_name %>
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.

Awesome! :)


production:
adapter: redis
url: redis://<%%= ENV.fetch("REDIS_HOST") { "localhost" } %>:6379/1
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.

What about using redis_url instead of REDIS_HOST?

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.

Totally agree :D. I'm including the protocol, port and db as well.

# For details on connection pooling, see rails configuration guide
# http://guides.rubyonrails.org/configuring.html#database-pooling
pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
host: <%%= ENV.fetch("DB_HOST") { "localhost" } %>
Copy link
Copy Markdown
Contributor

@josepjaume josepjaume Sep 27, 2016

Choose a reason for hiding this comment

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

I'd use url instead, and the default value (will look a bit weird):

url: <%%= ENV.fetch("DATABASE_URL") { "url: postgresql://localhost/blog_development?pool=5" } %>

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.

It's cool. On it!

@oriolgual oriolgual merged commit 74c81b7 into master Sep 28, 2016
@oriolgual oriolgual deleted the docker branch September 28, 2016 10:13
isaacmg410 pushed a commit that referenced this pull request Nov 14, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 14, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
agustibr added a commit that referenced this pull request Nov 14, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 15, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 15, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 16, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 16, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 16, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
isaacmg410 pushed a commit that referenced this pull request Nov 21, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
aitorlb pushed a commit that referenced this pull request Nov 23, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
aitorlb pushed a commit that referenced this pull request Nov 23, 2018
* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate
mrcasals pushed a commit that referenced this pull request Nov 30, 2018
* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Add validate amendment form examples and test

* Drop notifications test until we know how to resolve it

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Enable UserGroup to Amend

* Accept Amendment

* fix flash type on accepted error

* Added Amend system Specs for Creation

* configurable amendable fields

* Fix amender can edit proposal if emendation accepted

* Fix amender can react to emendations if emendation accepted

* Add amendment accepted notifications

* Add review form validations

* Add accept amendment examples and test

* Add accept amendment examples and test

* Drop unused locale key

* Fix amend_proposal_spec and delete an old test

* Fix proposals_spec

* Fix model proposal spec

* Refactor thanks to review

* Refactor thanks to review

* Refactor thanks to review

* Fix rubocop offenses

* Delete useless file

* Delete useless files

* Add changelog entry and documentation

* Refactor thanks to review

* Fix mistake when merging/rebasing

* Fix Markdown linter offenses

* Fix error in merge

* Delete useless comment

* Change proposal state colors to match admin proposal manager with proposal component
oriolgual pushed a commit that referenced this pull request Dec 3, 2018
* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Refactored due to review

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Refactored due to review

* moved to amendable dir

fix docs

* Reject Amendment

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Add validate amendment form examples and test

* Add amendment rejected notifications

* Add automatically reject amendments of a withdrawn proposal

* Add promoting functionality and promoted amendment notifications

* Add reject/promote amendment system spec

* Add reject amendment examples and test

* Add promote amendment examples and test

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Add validate amendment form examples and test

* Drop notifications test until we know how to resolve it

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Enable UserGroup to Amend

* Accept Amendment

* fix flash type on accepted error

* Added Amend system Specs for Creation

* configurable amendable fields

* Fix amender can edit proposal if emendation accepted

* Fix amender can react to emendations if emendation accepted

* Add amendment accepted notifications

* Add review form validations

* Add accept amendment examples and test

* Add accept amendment examples and test

* Drop unused locale key

* Drop notifications tests until we know how to resolve them

* Fix amend_proposal_spec and delete an old test

* Fix proposals_spec

* Fix proposals_spec

* Fix model proposal spec

* Fix model proposal spec

* Fix rubocop offences

* Refactor thanks to review

* Refactor thanks to review

* Refactor thanks to review

* Fix rubocop offenses

* Delete useless file

* Delete useless files

* Add changelog entry and documentation

* Refactor thanks to review

* Fix mistake when merging/rebasing

* Fix Markdown linter offenses

* Refactor promote action/form/command

* Refactor thanks to review

* Refactor thanks to review

Add reject/promote form specs, reject/promote amendment examples traceability tests and fix amend_proposal_spec

* Refactor thanks to review

Fix rubocop offenses and refactor promotable_by? to be more robust

* Fix rubocop offenses

* Refactor promotable_by?

* Refactor thanks to review

Add traceability tests in amendment command specs. Add specs for amendment events. Refactor amendment commands. Refactor `promotable_by?`.

* Drop useless line in `promotable_by?` method

* Refactor thanks to review

Add notification tests in amendment command specs. Fix rubocop offenses.

* Refactor thanks to review

Refactor amendment action buttons/cells. Moved promoted button into amendments helper.

* Fix rubocop offenses

* Add enforce_permission_to :promote
oriolgual pushed a commit that referenced this pull request Dec 4, 2018
* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Refactored due to review

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Refactored due to review

* moved to amendable dir

fix docs

* Reject Amendment

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Add validate amendment form examples and test

* Add amendment rejected notifications

* Add automatically reject amendments of a withdrawn proposal

* Add promoting functionality and promoted amendment notifications

* Add reject/promote amendment system spec

* Add reject amendment examples and test

* Add promote amendment examples and test

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Add validate amendment form examples and test

* Drop notifications test until we know how to resolve it

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Refactored due to review

* Enable UserGroup to Amend

* moved to amendable dir

fix docs

* add @emendation_form to proposals_controller

* add evaluating? method

* add :emendation and :amendment to EmendationActionsCell

* Add Amended by list in amendable detail

* Fix Created notice

* Use CollapsibleListCell for amendments list

* add action_authorized_link_to to amend_button_card

* Added Amend system Specs for Creation

* configurable amendable fields

* Update amendable/create to perform_action

* Permit and admin react on an official emmendation

* Add "Amendment" label to CardM

* add hashtags support

* minor improvements for amendables

* Fix proposals/emendations state (#17)

* Fix proposals/emendations state

* Test ProposalMCell proposal/emendation state

* Fix rubocop offences (forgot)

* Refactor amend proposal system spec

* Start fixing admin dashboard

* Fix admin dashboard

* Start fixing amendment form validations

* Refactor amendment form validations

Basic functionality working with redirect_to amendable_gid

* Refactor amendment form validation redirect_to

* Feature/amendments proposals on proposals withdraw (#18)

* Fix emendation withdraw

* Refactor change_proposal_state_to_withdrawn

* Fix proposals_show withdrawn translation missing

* Fix states of proposals

* Button Answer disabled if amendment

* Refactor withdraw to work with "See all withdrawn proposals"

* Check for amendments even if user is not logged in

* Amend Proposal system test

* Fix error when merging cristian/aitor branches

* Check for amendments even if user is not logged in - fixed

* Fix rubocop offences

* Fix mistake when refactoring emendation withdraw

Forgot to change withdraw_proposal.rb back to its original state.

* Add withdraw amendment test

* Fix admin dashboard

* Add red color to withdrawn state in admin manager

* Change proposal_state to resource_state

* Resolve conversations

* Feature/amendments proposals on proposals unable button (#19)

* Unable "Answer" button when the proposal is an emendation

* Fixed offenses with Rubocop

* fixed translate

* fix rubocop offenses

* fix specs and some minor problems to counter cache update

* fix codeclimate errors

* return to a previous version

* make some methods private

* run rubocop to fix codeclimate offenses

* working with specs

* Add create amendment example

* Move files

* Fix rubocop offenses

* Add withdraw amendment examples and test

* Add amendments seeds

* Add has_footer? method again to fix amendment title links

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment feature activated in the proposal component admin panel and render Ammend Button

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Amendment model, Amendable concern, amendments_list, emendation_announcement, emendation_actions ...

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Refactored due to review

* Enable UserGroup to Amend

* Accept Amendment

* fix flash type on accepted error

* Added Amend system Specs for Creation

* configurable amendable fields

* Fix amender can edit proposal if emendation accepted

* Fix amender can react to emendations if emendation accepted

* Add amendment accepted notifications

* Add review form validations

* Add accept amendment examples and test

* Add accept amendment examples and test

* Drop unused locale key

* Drop notifications tests until we know how to resolve them

* Fix amend_proposal_spec and delete an old test

* Fix proposals_spec

* Fix proposals_spec

* Fix model proposal spec

* Fix model proposal spec

* Add proposals/emendations control version

* Add proposals/emendations control version

* Fix rubocop offences

* Fix collaborative_drafts_spec

* Refactor thanks to review

* Refactor thanks to review

* Refactor thanks to review

* Fix rubocop offenses

* Delete useless file

* Delete useless files

* Add changelog entry and documentation

* Refactor thanks to review

* Fix mistake when merging/rebasing

* Fix Markdown linter offenses

* Refactor promote action/form/command

* Fix proposal version author if user group chosen

* Fix errors when merging

* Fix conflicts when merging

* Delete useless method

* Refactor publish_proposal

* Fix rubocop offenses

* Refactor version control documentation

* Fix proposals actions on the public view show in admin log

* Refactor thanks to review

* Refactor thanks to review

* Revert rubocop change

* Fix traceability test in proposals specs after version control refactor
alecslupu referenced this pull request in i-need-another-coffee/decidim Oct 7, 2020
Quentinchampenois referenced this pull request in Quentinchampenois/decidim Oct 19, 2020
Leusev pushed a commit that referenced this pull request Nov 25, 2020
* Opening commit 🚧

* Allow user to drag address on proposal map

* Fix offenses

* Fix shared example

* Fix proposal spec

* Ligh refactor

* Fix admin form

* Skip test on admin side

* Refactor test example

* Remove useless message

* FIx offenses

* add drag cursor map (#19)

* merge branch 'develop'

* disable rubocop RSpec/EmptyExampleGroup for proposal wizards example

* Fix drag cursor ci (#23)

* fix failing test

* refactor proposals_wizards_examples

Co-authored-by: Armand Fardeau <fardeauarmand@gmail.com>

* Add map helper spec

* Fix test

Co-authored-by: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants