Skip to content
Permalink
Browse files

Update nokogiri and devise to fix security alerts (#5338)

* Update nokogiri and devise too fix security alerts

* Update rubocop

* Fix erblint complaints
  • Loading branch information...
oriolgual committed Sep 19, 2019
1 parent aebf373 commit cb75e8aa52abb672b05681b0169ae4b1e2d31740
Showing with 656 additions and 648 deletions.
  1. +6 −0 .rubocop.yml
  2. +37 −35 Gemfile.lock
  3. +1 −1 decidim-accountability/app/views/decidim/accountability/admin/results/_proposals.html.erb
  4. +1 −1 decidim-accountability/app/views/decidim/accountability/admin/results/index.html.erb
  5. +1 −1 decidim-accountability/app/views/decidim/accountability/admin/statuses/index.html.erb
  6. +1 −1 decidim-accountability/app/views/decidim/accountability/admin/timeline_entries/index.html.erb
  7. +1 −1 decidim-accountability/app/views/decidim/accountability/results/_show_leaf.html.erb
  8. +1 −1 decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
  9. +1 −1 decidim-admin/app/views/decidim/admin/attachment_collections/show.html.erb
  10. +1 −1 decidim-admin/app/views/decidim/admin/attachments/index.html.erb
  11. +1 −1 decidim-admin/app/views/decidim/admin/attachments/show.html.erb
  12. +2 −2 decidim-admin/app/views/decidim/admin/categories/index.html.erb
  13. +1 −1 decidim-admin/app/views/decidim/admin/categories/show.html.erb
  14. +1 −1 decidim-admin/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb
  15. +2 −2 decidim-admin/app/views/decidim/admin/participatory_space_private_users/index.html.erb
  16. +1 −1 decidim-admin/app/views/decidim/admin/static_pages/_topic.html.erb
  17. +1 −1 decidim-admin/app/views/decidim/admin/static_pages/show.html.erb
  18. +6 −6 decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
  19. +1 −1 decidim-admin/app/views/layouts/decidim/admin/_header.html.erb
  20. +1 −1 decidim-admin/decidim-admin.gemspec
  21. +3 −3 decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
  22. +3 −3 decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
  23. +1 −1 decidim-assemblies/app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb
  24. +1 −1 decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb
  25. +1 −1 decidim-blogs/app/views/decidim/blogs/admin/posts/index.html.erb
  26. +1 −1 decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
  27. +1 −1 decidim-conferences/app/cells/decidim/conferences/conference_address/show.erb
  28. +2 −2 decidim-conferences/app/cells/decidim/conferences/conference_speaker/show.erb
  29. +3 −3 decidim-conferences/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb
  30. +3 −3 decidim-conferences/app/views/decidim/conferences/admin/conferences/index.html.erb
  31. +1 −1 ...ferences/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb
  32. +1 −1 decidim-conferences/app/views/decidim/conferences/conferences/_partners.html.erb
  33. +3 −3 decidim-conferences/app/views/decidim/conferences/conferences/show.html.erb
  34. +2 −2 decidim-conferences/app/views/decidim/conferences/media/index.html.erb
  35. +2 −2 decidim-conferences/app/views/layouts/decidim/diploma.html.erb
  36. +2 −2 decidim-consultations/app/cells/decidim/consultations/consultation_m/data.erb
  37. +2 −2 decidim-consultations/app/views/decidim/consultations/admin/consultations/index.html.erb
  38. +2 −2 decidim-consultations/app/views/decidim/consultations/admin/questions/index.html.erb
  39. +1 −1 decidim-consultations/app/views/decidim/consultations/questions/show.html.erb
  40. +2 −2 decidim-core/app/cells/decidim/address/details.erb
  41. +1 −1 decidim-core/app/cells/decidim/notifications/show.erb
  42. +1 −1 decidim-core/app/cells/decidim/search_results_section/show.erb
  43. +2 −2 decidim-core/app/views/decidim/account/delete.html.erb
  44. +1 −1 decidim-core/app/views/decidim/account/show.html.erb
  45. +1 −1 decidim-core/app/views/decidim/amendments/preview_draft.html.erb
  46. +3 −3 decidim-core/app/views/decidim/doorkeeper/authorizations/new.html.erb
  47. +1 −1 decidim-core/app/views/decidim/export_mailer/data_portability_export.html.erb
  48. +2 −2 decidim-core/app/views/decidim/shared/_address_details.html.erb
  49. +1 −1 decidim-core/app/views/decidim/shared/_embed_modal.html.erb
  50. +1 −1 decidim-core/app/views/decidim/shared/_share_modal.html.erb
  51. +12 −12 decidim-core/app/views/layouts/decidim/_head.html.erb
  52. +2 −2 decidim-core/app/views/layouts/decidim/mailer.html.erb
  53. +1 −1 decidim-core/decidim-core.gemspec
  54. +1 −1 decidim-debates/app/views/decidim/debates/admin/debates/index.html.erb
  55. +1 −1 decidim-dev/decidim-dev.gemspec
  56. +1 −1 decidim-forms/app/cells/decidim/forms/question_readonly/show.erb
  57. +28 −28 decidim-generators/Gemfile.lock
  58. +1 −1 decidim-initiatives/app/cells/decidim/initiatives_votes/vote/show.erb
  59. +2 −2 decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb
  60. +3 −3 decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/show.html.erb
  61. +1 −1 decidim-initiatives/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb
  62. +1 −1 decidim-initiatives/app/views/decidim/initiatives/committee_requests/new.html.erb
  63. +1 −1 decidim-initiatives/app/views/decidim/initiatives/create_initiative/fill_data.html.erb
  64. +1 −1 decidim-initiatives/app/views/decidim/initiatives/create_initiative/finish.html.erb
  65. +1 −1 decidim-initiatives/app/views/decidim/initiatives/create_initiative/previous_form.html.erb
  66. +1 −1 decidim-initiatives/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb
  67. +2 −2 decidim-initiatives/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb
  68. +1 −1 ...dim-initiatives/app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb
  69. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb
  70. +2 −2 decidim-initiatives/app/views/decidim/initiatives/initiatives/_result.html.erb
  71. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
  72. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiatives/signature_identities.html.erb
  73. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb
  74. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_progress.html.erb
  75. +1 −1 decidim-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_state_change.html.erb
  76. +1 −1 ...m-initiatives/app/views/decidim/initiatives/initiatives_mailer/notify_validating_request.html.erb
  77. +2 −2 decidim-initiatives/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb
  78. +2 −2 decidim-meetings/app/cells/decidim/meetings/meetings_map/show.erb
  79. +1 −1 decidim-meetings/app/views/decidim/meetings/_calendar_modal.html.erb
  80. +1 −1 decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb
  81. +1 −1 decidim-meetings/app/views/decidim/meetings/meetings/_meeting_agenda.html.erb
  82. +1 −1 decidim-meetings/app/views/decidim/participatory_spaces/_conference_venues.html.erb
  83. +2 −2 decidim-participatory_processes/app/cells/decidim/participatory_processes/process_m/data.erb
  84. +1 −1 ...esses/app/views/decidim/participatory_processes/admin/participatory_process_groups/index.html.erb
  85. +1 −1 ...cesses/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
  86. +1 −1 ...ocesses/app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb
  87. +3 −3 ...s/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb
  88. +3 −3 ..._processes/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb
  89. +3 −3 decidim-proposals/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
  90. +1 −1 decidim-proposals/app/views/decidim/proposals/proposals/_proposal_preview.html.erb
  91. +1 −1 decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
  92. +1 −1 decidim-proposals/app/views/decidim/proposals/proposals/participatory_texts/_index.html.erb
  93. +1 −1 decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb
  94. +1 −1 decidim-sortitions/app/views/decidim/sortitions/sortitions/show.html.erb
  95. +1 −1 decidim-system/app/views/decidim/system/admins/index.html.erb
  96. +1 −1 decidim-system/app/views/decidim/system/admins/show.html.erb
  97. +1 −1 decidim-system/app/views/decidim/system/devise/passwords/edit.html.erb
  98. +6 −6 decidim-system/app/views/decidim/system/devise/shared/_links.html.erb
  99. +1 −1 decidim-system/app/views/decidim/system/organizations/index.html.erb
  100. +1 −1 decidim-system/app/views/decidim/system/organizations/show.html.erb
  101. +1 −1 decidim-system/app/views/layouts/decidim/system/_header.html.erb
  102. +1 −1 decidim-system/decidim-system.gemspec
  103. +28 −28 decidim_app-design/Gemfile.lock
  104. +3 −3 decidim_app-design/app/views/admin/component-meetings-add-item.html.erb
  105. +6 −6 decidim_app-design/app/views/admin/component-meetings-edit-errors.html.erb
  106. +3 −3 decidim_app-design/app/views/admin/component-meetings-edit-item.html.erb
  107. +6 −6 decidim_app-design/app/views/admin/component-meetings-initial.html.erb
  108. +6 −6 decidim_app-design/app/views/admin/component-meetings-items.html.erb
  109. +2 −2 decidim_app-design/app/views/admin/component-meetings-minutes-edit.html.erb
  110. +4 −4 decidim_app-design/app/views/admin/component-meetings-minutes.html.erb
  111. +6 −6 decidim_app-design/app/views/admin/component-meetings-with-content.html.erb
  112. +2 −2 decidim_app-design/app/views/admin/component-proposals-actions.html.erb
  113. +2 −2 decidim_app-design/app/views/admin/component-proposals-apply-action.html.erb
  114. +2 −2 decidim_app-design/app/views/admin/component-proposals-none.html.erb
  115. +2 −2 decidim_app-design/app/views/admin/component-proposals-search.html.erb
  116. +4 −4 decidim_app-design/app/views/admin/component-proposals-selected.html.erb
  117. +1 −1 decidim_app-design/app/views/admin/form-with-datepicker.html.erb
  118. +8 −8 decidim_app-design/app/views/admin/form-with-validation.html.erb
  119. +1 −1 decidim_app-design/app/views/admin/partials/_filter_table.html.erb
  120. +1 −1 decidim_app-design/app/views/admin/partials/_participatory-article.html.erb
  121. +2 −2 decidim_app-design/app/views/admin/participatory-texts.html.erb
  122. +29 −29 decidim_app-design/app/views/admin/process-info.html.erb
  123. +5 −5 decidim_app-design/app/views/admin/process-steps-new.html.erb
  124. +5 −5 decidim_app-design/app/views/admin/processes-new-2.html.erb
  125. +30 −30 decidim_app-design/app/views/admin/processes-new-3-add.html.erb
  126. +31 −31 decidim_app-design/app/views/admin/processes-new.html.erb
  127. +2 −2 decidim_app-design/app/views/admin/scope-edit.html.erb
  128. +6 −6 decidim_app-design/app/views/admin/settings.html.erb
  129. +1 −1 decidim_app-design/app/views/layouts/admin.html.erb
  130. +1 −1 decidim_app-design/app/views/layouts/public.html.erb
  131. +1 −1 decidim_app-design/app/views/public/amendments/amendment-creation-wizard.html.erb
  132. +1 −1 decidim_app-design/app/views/public/amendments/proposal-view-with-amendment-rejected.html.erb
  133. +1 −1 decidim_app-design/app/views/public/assemblies/assemblies.html.erb
  134. +3 −3 decidim_app-design/app/views/public/assemblies/assembly-view.html.erb
  135. +1 −1 decidim_app-design/app/views/public/cards/m/_assembly.html.erb
  136. +1 −1 decidim_app-design/app/views/public/cards/m/_consultation.html.erb
  137. +5 −5 decidim_app-design/app/views/public/cards/m/_meeting.html.erb
  138. +2 −2 decidim_app-design/app/views/public/cards/m/_process.html.erb
  139. +1 −1 decidim_app-design/app/views/public/cards/m/_search-results.html.erb
  140. +1 −1 decidim_app-design/app/views/public/cards/m/_survey.html.erb
  141. +1 −1 decidim_app-design/app/views/public/conferences/conference-view-diploma.html.erb
  142. +2 −2 decidim_app-design/app/views/public/conferences/conference-view-media.html.erb
  143. +1 −1 decidim_app-design/app/views/public/conferences/conference-view-speakers.html.erb
  144. +6 −6 decidim_app-design/app/views/public/conferences/conference-view.html.erb
  145. +1 −1 decidim_app-design/app/views/public/consultations-entities-view.html.erb
  146. +6 −6 decidim_app-design/app/views/public/consultations-entities.html.erb
  147. +6 −6 decidim_app-design/app/views/public/consultations-meetings.html.erb
  148. +7 −7 decidim_app-design/app/views/public/consultations-voting-places.html.erb
  149. +3 −3 decidim_app-design/app/views/public/email-inline.html.erb
  150. +1 −1 decidim_app-design/app/views/public/form-datepicker.html.erb
  151. +3 −3 decidim_app-design/app/views/public/form-validation.html.erb
  152. +2 −2 decidim_app-design/app/views/public/home-single-process.html.erb
  153. +1 −1 decidim_app-design/app/views/public/home-with-consultation-banners.html.erb
  154. +2 −2 decidim_app-design/app/views/public/home-with-helpers.html.erb
  155. +2 −2 decidim_app-design/app/views/public/home.html.erb
  156. +2 −2 decidim_app-design/app/views/public/index.html.erb
  157. +3 −3 decidim_app-design/app/views/public/initiatives/initiatives-support-step-1.html.erb
  158. +1 −1 decidim_app-design/app/views/public/initiatives/initiatives-support-step-2.html.erb
  159. +7 −7 decidim_app-design/app/views/public/initiatives/initiatives-support-step-3.html.erb
  160. +2 −2 decidim_app-design/app/views/public/library/_library-buttons.html.erb
  161. +1 −1 decidim_app-design/app/views/public/library/_library-icons.html.erb
  162. +5 −5 decidim_app-design/app/views/public/library/_library-javascripts.html.erb
  163. +5 −5 decidim_app-design/app/views/public/meetings/meeting-view-closed.html.erb
  164. +5 −5 decidim_app-design/app/views/public/meetings/meeting-view-custom-status.html.erb
  165. +5 −5 decidim_app-design/app/views/public/meetings/meeting-view-longer.html.erb
  166. +2 −2 decidim_app-design/app/views/public/meetings/meeting-view.html.erb
  167. +3 −3 decidim_app-design/app/views/public/meetings/meetings-callout.html.erb
  168. +2 −2 decidim_app-design/app/views/public/meetings/meetings.html.erb
  169. +3 −3 decidim_app-design/app/views/public/oauth.html.erb
  170. +1 −1 decidim_app-design/app/views/public/partials/_block_banner.html.erb
  171. +1 −1 decidim_app-design/app/views/public/partials/_budget_summary.html.erb
  172. +2 −2 decidim_app-design/app/views/public/partials/_comments.html.erb
  173. +1 −1 decidim_app-design/app/views/public/partials/_conferences_nav.html.erb
  174. +1 −1 decidim_app-design/app/views/public/partials/_consultations_header_home.html.erb
  175. +19 −19 decidim_app-design/app/views/public/partials/_filters.html.erb
  176. +5 −5 decidim_app-design/app/views/public/partials/_filters_notifications.html.erb
  177. +5 −5 decidim_app-design/app/views/public/partials/_filters_small_view.html.erb
  178. +3 −3 decidim_app-design/app/views/public/partials/_flag.html.erb
  179. +4 −4 decidim_app-design/app/views/public/partials/_meetings_highlights.html.erb
  180. +2 −2 decidim_app-design/app/views/public/partials/_related_meetings.html.erb
  181. +1 −1 decidim_app-design/app/views/public/partials/_search_input.html.erb
  182. +1 −1 decidim_app-design/app/views/public/partials/_tags.html.erb
  183. +1 −1 decidim_app-design/app/views/public/partials/_topbar.html.erb
  184. +2 −2 decidim_app-design/app/views/public/participatory/_index.html.erb
  185. +1 −1 decidim_app-design/app/views/public/profile/_conversation.html.erb
  186. +2 −2 decidim_app-design/app/views/public/profile/_conversations.html.erb
  187. +1 −1 decidim_app-design/app/views/public/profile/_notifications.html.erb
  188. +1 −1 decidim_app-design/app/views/public/profile/_user-card.html.erb
  189. +1 −1 decidim_app-design/app/views/public/proposals/new-proposal.html.erb
  190. +1 −1 decidim_app-design/app/views/public/proposals/proposals-wizard-step-1.html.erb
  191. +1 −1 decidim_app-design/app/views/public/proposals/proposals-wizard-step-3.html.erb
  192. +2 −2 decidim_app-design/app/views/public/search.html.erb
  193. +2 −2 decidim_app-design/app/views/public/user/_modal-question-user-existent.html.erb
  194. +3 −3 decidim_app-design/app/views/public/user/_modal-question-user-new.html.erb
  195. +1 −1 decidim_app-design/app/views/public/user/_modal-question.html.erb
  196. +1 −1 decidim_app-design/app/views/public/user/user-confirm.html.erb
  197. +2 −2 decidim_app-design/app/views/public/user/user-invitation.html.erb
  198. +3 −3 decidim_app-design/app/views/public/user/user-login.html.erb
  199. +1 −1 decidim_app-design/app/views/public/user/user-new-password.html.erb
  200. +10 −10 decidim_app-design/app/views/public/user/user-register.html.erb
  201. +10 −10 decidim_app-design/app/views/public/user/user-settings.html.erb
  202. +3 −3 decidim_app-design/app/views/public/user/user-verification.html.erb
  203. +11 −11 decidim_app-design/app/views/public/vizzs/_areacharts.html.erb
  204. +6 −6 decidim_app-design/app/views/public/vizzs/_linecharts.html.erb
  205. +9 −9 decidim_app-design/app/views/public/vizzs/_rowcharts.html.erb
@@ -1242,4 +1242,10 @@ RSpec/NamedSubject:
RSpec/VerifiedDoubles:
Enabled: false

RSpec/LeakyConstantDeclaration:
Enabled: false

RSpec/DescribedClass:
Enabled: false

inherit_from: .rubocop_rails.yml
@@ -29,7 +29,7 @@ PATH
decidim-admin (0.19.0.dev)
active_link_to (~> 1.0)
decidim-core (= 0.19.0.dev)
devise (~> 4.6)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 1.7)
jquery-rails (~> 4.3)
@@ -76,7 +76,7 @@ PATH
charlock_holmes (~> 0.7)
date_validator (~> 0.9.0)
decidim-api (= 0.19.0.dev)
devise (~> 4.6)
devise (~> 4.7)
devise-i18n (~> 1.2)
doorkeeper (~> 5.1)
doorkeeper-i18n (~> 4.0)
@@ -111,7 +111,7 @@ PATH
rubyzip (~> 1.2, >= 1.2.2)
sassc (~> 1.12, >= 1.12.1)
sassc-rails (~> 1.3)
social-share-button (~> 1.2)
social-share-button (~> 1.2, >= 1.2.1)
spreadsheet (~> 1.2)
sprockets-es6 (~> 0.9.2)
truncato (~> 0.7)
@@ -132,7 +132,7 @@ PATH
factory_bot_rails (~> 4.8)
i18n-tasks (~> 0.9.18)
mdl (~> 0.5.0)
nokogiri (~> 1.10)
nokogiri (>= 1.10.4)
puma (~> 3.12)
rails-controller-testing (~> 1.0)
rspec-cells (~> 0.3.4)
@@ -198,7 +198,7 @@ PATH
decidim-system (0.19.0.dev)
active_link_to (~> 1.0)
decidim-core (= 0.19.0.dev)
devise (~> 4.6)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 1.7)
jquery-rails (~> 4.3)
@@ -272,7 +272,7 @@ GEM
execjs (~> 2.0)
batch-loader (1.4.1)
bcrypt (3.1.13)
better_html (1.0.13)
better_html (1.0.14)
actionview (>= 4.0)
activesupport (>= 4.0)
ast (~> 2.0)
@@ -285,7 +285,7 @@ GEM
msgpack (~> 1.0)
builder (3.2.3)
byebug (11.0.1)
capybara (3.24.0)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -309,7 +309,7 @@ GEM
actionpack (>= 3.0)
cells (>= 4.1.6, < 5.0.0)
charlock_holmes (0.7.6)
childprocess (1.0.1)
childprocess (2.0.0)
rake (< 13.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
@@ -338,13 +338,13 @@ GEM
declarative-option (0.1.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.6.2)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-i18n (1.8.0)
devise-i18n (1.8.2)
devise (>= 4.6)
devise_invitable (1.7.5)
actionmailer (>= 4.1.0)
@@ -357,11 +357,11 @@ GEM
docile (1.3.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.1.0)
doorkeeper (5.2.0)
railties (>= 5)
doorkeeper-i18n (4.0.1)
equalizer (0.0.11)
erb_lint (0.0.28)
erb_lint (0.0.29)
activesupport
better_html (~> 1.0.7)
html_tokenizer
@@ -404,11 +404,12 @@ GEM
railties
sprockets-rails
graphql (1.9.6)
hashdiff (1.0.0.beta1)
hashdiff (1.0.0)
hashie (3.6.0)
highline (2.0.2)
html_tokenizer (0.0.7)
htmlentities (4.3.4)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
httparty (0.17.0)
@@ -430,7 +431,7 @@ GEM
ice_cube (~> 0.16)
ice_cube (0.16.3)
ice_nine (0.11.2)
invisible_captcha (0.12.1)
invisible_captcha (0.12.2)
rails (>= 3.2.0)
jaro_winkler (1.5.3)
jquery-rails (4.3.5)
@@ -497,7 +498,7 @@ GEM
netrc (0.11.0)
nio4r (2.3.1)
nobspw (0.6.1)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
oauth2 (1.4.1)
@@ -511,10 +512,10 @@ GEM
rack (>= 1.6.2, < 3)
omniauth-facebook (5.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (0.7.0)
omniauth-google-oauth2 (0.8.0)
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
omniauth-oauth2 (>= 1.6)
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
@@ -530,11 +531,11 @@ GEM
origami (2.1.0)
colorize (~> 0.7)
orm_adapter (0.5.0)
paper_trail (10.3.0)
activerecord (>= 4.2, < 6.1)
paper_trail (10.3.1)
activerecord (>= 4.2)
request_store (~> 1.1)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.6.4.1)
ast (~> 2.4.0)
pg (1.1.4)
pg_search (2.3.0)
@@ -575,7 +576,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
@@ -587,7 +588,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rake (12.3.3)
ransack (2.1.1)
actionpack (>= 5.0)
activerecord (>= 5.0)
@@ -604,13 +605,14 @@ GEM
wisper (>= 1.6.1)
redcarpet (3.5.0)
redis (4.1.2)
regexp_parser (1.5.1)
regexp_parser (1.6.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rest-client (2.0.2)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
@@ -621,7 +623,7 @@ GEM
rspec-cells (0.3.4)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (~> 3.2)
rspec-core (3.8.1)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
@@ -653,7 +655,7 @@ GEM
rubocop-rails (2.0.1)
rack (>= 1.1)
rubocop (>= 0.70.0)
rubocop-rspec (1.33.0)
rubocop-rspec (1.35.0)
rubocop (>= 0.60.0)
ruby-ole (1.2.12.2)
ruby-progressbar (1.10.1)
@@ -672,15 +674,15 @@ GEM
sprockets-rails
tilt
searchlight (4.1.0)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
selenium-webdriver (3.142.4)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
simplecov (0.16.1)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
smart_properties (1.14.0)
smart_properties (1.15.0)
social-share-button (1.2.1)
coffee-rails
spreadsheet (1.2.4)
@@ -738,7 +740,7 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webmock (3.6.0)
webmock (3.7.4)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -2,7 +2,7 @@
<h1><%= t(".current_selection") %></h1>
</div>
<div class="picker-content">
<input type="text" name="proposal-search" id="data_picker-autocomplete" />
<input type="text" name="proposal-search" id="data_picker-autocomplete">
</div>
<div class="picker-footer">
<div class="buttons button--double">
@@ -24,7 +24,7 @@
<% results.each do |result| %>
<tr data-id="<%= result.id %>">
<td>
<%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %><br />
<%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %><br>
</td>
<td class="table-list__actions">
<%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
@@ -21,7 +21,7 @@
<tbody>
<% statuses.each do |status| %>
<tr data-id="<%= status.id %>">
<td><%= status.key %><br /></td>
<td><%= status.key %><br></td>
<td><%= translated_attribute(status.name) %></td>
<td><%= truncate translated_attribute(status.description), lenght: 50 %></td>
<td><%= status.progress %></td>
@@ -20,7 +20,7 @@
<tbody>
<% timeline_entries.each do |timeline_entry| %>
<tr data-id="<%= timeline_entry.id %>">
<td><%= timeline_entry.entry_date %><br /></td>
<td><%= timeline_entry.entry_date %><br></td>
<td><%= translated_attribute(timeline_entry.description) %></td>
<td class="table-list__actions">
<% if allowed_to? :update, :timeline_entry, timeline_entry: timeline_entry %>
@@ -58,7 +58,7 @@
</div>
</div>

<hr />
<hr>

<div class="small-12 mediumlarge-8 large-9 columns">
<div class="section result-description">
@@ -22,7 +22,7 @@
<% collection_for.attachment_collections.each do |attachment_collection| %>
<tr data-id="<%= attachment_collection.id %>">
<td>
<%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %><br />
<%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %><br>
</td>
<td class="table-list__actions">
<% if allowed_to? :update, :attachment_collection, attachment_collection: attachment_collection %>
@@ -1,7 +1,7 @@
<h3><%= translated_attribute(@attachment_collection.name) %></h3>

<div class="actions">
<hr />
<hr>
<%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment_collection.collection_for, @attachment_collection], class: "button" if allowed_to? :update, :attachment_collection, attachment_collection: @attachment_collection %>
<%= link_to t("decidim.admin.actions.destroy"), [@attachment_collection.collection_for, @attachment_collection], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment_collection, attachment_collection: @attachment_collection %>
</div>
@@ -25,7 +25,7 @@
<% attached_to.attachments.each do |attachment| %>
<tr data-id="<%= attachment.id %>">
<td>
<%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br />
<%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br>
</td>
<td>
<%= translated_attribute(attachment.attachment_collection&.name) %>
@@ -1,7 +1,7 @@
<h3><%= translated_attribute(@attachment.title) %></h3>

<div class="actions">
<hr />
<hr>
<%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment.attached_to, @attachment] if allowed_to? :update, :attachment, attachment: @attachment %>
<%= link_to t("decidim.admin.actions.destroy"), [@attachment.attached_to, @attachment], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment, attachment: @attachment %>
</div>
@@ -22,7 +22,7 @@
<% current_participatory_space.categories.first_class.each do |category| %>
<tr>
<td>
<%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %><br />
<%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %><br>
</td>
<td class="table-list__actions">
<% if allowed_to? :update, :category, category: category %>
@@ -43,7 +43,7 @@
<% category.subcategories.each do |subcategory| %>
<tr class="extra__table-list__subcategory">
<td>
<%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br />
<%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br>
</td>
<td class="table-list__actions">
<% if allowed_to? :update, :category, category: subcategory %>
@@ -1,7 +1,7 @@
<h3><%= translated_attribute(@category.name) %></h3>

<div class="actions">
<hr />
<hr>
<%= link_to t("decidim.admin.actions.edit"), ["edit", participatory_space, @category] if allowed_to? :update, :category, category: @category %>
<%= link_to t("decidim.admin.actions.destroy"), [participatory_space, @category], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :category, category: @category %>
</div>
@@ -22,7 +22,7 @@
<p class="help-text"><%= t ".all_users_help" %></p>
</div>
</div>
<hr class="reset mt-s mb-s" />
<hr class="reset mt-s mb-s">
<% end %>
<div class="grid-x grid-padding-x">
<div class="cell small-12 medium-6" id="send_newsletter_to_followers">
@@ -26,10 +26,10 @@
<% collection.each do |private_user| %>
<tr>
<td>
<%= private_user.user.name %><br />
<%= private_user.user.name %><br>
</td>
<td>
<%= private_user.user.email %><br />
<%= private_user.user.email %><br>
</td>
<td>
<% if private_user.user.invitation_sent_at %>
@@ -28,7 +28,7 @@
<% pages.each do |page| %>
<tr>
<td>
<%= link_to translated_attribute(page.title), ["edit", page] %><br />
<%= link_to translated_attribute(page.title), ["edit", page] %><br>
</td>
<td>
<%= l page.created_at, format: :short %>

0 comments on commit cb75e8a

Please sign in to comment.
You can’t perform that action at this time.