consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,315 Commits 1 Branch 0 Tags
dfd4f60e1595f374f96ad21fd7972275f79c606c
Commit Graph

11315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javi Martín
87b073cbca Migrate milestones images and documents 2018-11-30 14:15:21 +01:00
Javi Martín
4a7f479d21 Remove obsolete model usage 
We'd rather keep the table so future data migrations work smoothly, so
we change the migration in order to create the translation table without
using models.
 2018-11-30 14:15:21 +01:00
Javi Martín
1a5b73a0bd Don't load tasks several times in specs 
Calling `load_tasks` in several files made rails load the tasks several
times, and so they were executed several times when called.

Since the milestone migration can't be executed twice in a row (it would
fail with duplicated ID records), loading the tasks several times made
the milestone migrations task specs fail.
 2018-11-30 14:15:21 +01:00
Javi Martín
cb891f21d4 Simplify count_rows check 
We had a line which was too long according to rubocop, and simplifying
the code makes the line shorter.
 2018-11-30 14:15:21 +01:00
Javi Martín
a6adc0b5ab Reduce I18n.t usage in spec 
We also make the line shorter so rubocop doesn't complain.
 2018-11-30 14:15:21 +01:00
Javi Martín
9a093d5f8a Use let instead of instance variables 2018-11-30 14:15:21 +01:00
Marko Lovic
4c3dadf1fb Add Rake task to migrate milestone data to new tables 2018-11-30 14:15:21 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Javier Martín
7446ebbdd5 Merge pull request #3072 from consul/backport-1623-fix_flaky_driver_session 
[Backport] Fix flaky spec: Welcome screen is not shown to organizations
 2018-11-30 14:14:09 +01:00
Javi Martín
dc65c0cdb1 Fix space differences with Madrid's fork 2018-11-30 14:06:33 +01:00
Javi Martín
b153f5f902 Remove redundant Capybara actions 
Resetting sessions and driver is automatically done by requiring
'capybara/rspec', as shown by the (lack of) that configuration for RSpec
in the Capybara README, manual testing of those settings, and Capybara's
code itself.
 2018-11-30 13:37:16 +01:00
Javi Martín
2f860236a5 Reset page driver after every spec using it 
There were some issues because some specs  directly used the driver but
didn't reset it after the test.
 2018-11-30 13:34:01 +01:00
Javier Martín
c848741777 Merge pull request #3071 from consul/backport-fix_scope_warning 
[Backport] Fix scope warning
 2018-11-30 11:26:00 +01:00
Javi Martín
56df8050df Use @cards.each instead of @cards.find_each 
Using `find_each` ignores the scope order we set in `Widget::Card.body`,
and since we don't expect to have thousands of cards, using batches
isn't necessary.

This way we remove the "WARN Scoped order and limit are ignored, it's
forced to be batch order and batch size" message we were getting in the
specs.
 2018-11-29 20:10:23 +01:00
dependabot[bot]
eefe09e691 [Security] Bump rails from 4.2.10 to 4.2.11 
Bumps [rails](https://github.com/rails/rails) from 4.2.10 to 4.2.11. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v4.2.10...v4.2.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 22:54:32 +00:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
e23fbc8d58 Merge pull request #2970 from PierreMesure/Remove-icon-png-from-settings 
Removed icon_home and fixed corresponding test
 2018-11-27 11:11:51 +01:00
Raimond Garcia
181918330c Merge pull request #3029 from clairezed/patch-1 
Update debates_spec.rb
 2018-11-27 11:09:15 +01:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select 
Fix pagination after selecting/unselecting budget investment
 2018-11-27 11:04:41 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes 
Adds draft phase functionality in legislation processes
 2018-11-27 11:01:27 +01:00
Raimond Garcia
e4b0f2781d Merge pull request #3062 from danesjenovdan/slovenian-translations 
Added Slovenian translations
 2018-11-26 19:11:58 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id 
[Backport] Administrator ID
 2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers 
[Backport] Admin poll officers
 2018-11-26 15:03:55 +01:00
Alberto
1a89e52931 Merge pull request #3054 from consul/globalize-tabs 
[Backport] Globalize tabs
 2018-11-26 14:58:38 +01:00
Alberto
fce5fdff0d Merge pull request #3053 from consul/budget-investment-social-share 
[Backport] Budget investments social share
 2018-11-26 14:57:53 +01:00
peric
275cbf1adc Added Slovenian translations 2018-11-24 16:45:41 +01:00
Julian Herrero
c563f73189 create officer assignments in order 
Make sure we create the Poll::OfficerAssignments in the same order the
booth_assignments where previously created. So the spec "Poll::Shift
officer_assignments creates and destroy corresponding
officer_assignments does" not fail.
 2018-11-23 18:15:47 +01:00
voodoorai2000
46b66e9376 Downgrade autoprefixer-rails gem to 8.2.0 2018-11-23 02:16:35 +01:00
Raimond Garcia
574ef6b850 Merge pull request #3050 from consul/i18n_master 
New Crowdin translations
 2018-11-22 14:16:16 +01:00
Consul Bot
2fa19d5831 New translations mailers.yml (Arabic) 2018-11-22 13:22:12 +01:00
Consul Bot
3b4670d7bd New translations admin.yml (Arabic) 2018-11-22 13:11:37 +01:00
Consul Bot
fa0a726d7e New translations mailers.yml (Arabic) 2018-11-22 12:51:17 +01:00
Consul Bot
2110223a14 New translations mailers.yml (Arabic) 2018-11-22 12:41:10 +01:00
Consul Bot
264ecd2ce3 New translations devise_views.yml (Arabic) 2018-11-22 12:41:08 +01:00
Consul Bot
c34ebb0d52 New translations devise_views.yml (Arabic) 2018-11-22 12:31:07 +01:00
Consul Bot
12c050aac6 New translations pages.yml (Arabic) 2018-11-22 12:31:05 +01:00
Consul Bot
71a2d4844e New translations pages.yml (Arabic) 2018-11-22 12:21:36 +01:00
Consul Bot
4be0c11638 New translations moderation.yml (Arabic) 2018-11-22 12:21:35 +01:00
Consul Bot
78fdff63c8 New translations moderation.yml (Arabic) 2018-11-22 12:11:50 +01:00
Consul Bot
8ae3d39a74 New translations admin.yml (Somali) 2018-11-22 11:51:36 +01:00
Consul Bot
9415492401 New translations admin.yml (Somali) 2018-11-22 11:42:41 +01:00
decabeza
6d7c5f1b78 Refactors admin administrators spec 
This refactoring avoids "Use let instead of an instance variable" rubocop warning
 2018-11-22 11:41:59 +01:00
decabeza
ae3a2ed3f3 Adds administrator id on admin administrators index page 2018-11-22 11:41:54 +01:00
decabeza
3670859fa3 Removes unused admin poll officers views, routes and controller 2018-11-22 11:40:11 +01:00
decabeza
8f27398bd1 Fixes globalize tabs when there is a lot of available locales 2018-11-22 11:37:26 +01:00
decabeza
2c06008370 Improves social share message to budget investments 2018-11-22 11:35:09 +01:00
Consul Bot
ea41c64831 New translations admin.yml (Somali) 2018-11-22 11:31:21 +01:00
Consul Bot
e49a80b7b6 New translations admin.yml (Somali) 2018-11-22 10:22:42 +01:00