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

11202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javi Martín
8c45be7887 Show proposal info in admin 2018-12-11 20:09:30 +01:00
Javi Martín
d3f11c3b55 Add search form to proposals admin index 2018-12-11 20:09:30 +01:00
Javi Martín
4770217373 Add proposals index in admin 2018-12-11 20:09:30 +01:00
Javi Martín
7891efee32 Add milestones to proposals 2018-12-11 20:09:30 +01:00
Javier Martín
81e0931988 Merge pull request #3095 from consul/backport-share_milestoneable_code 
Make milestones code reusable
 2018-12-11 20:08:07 +01:00
Javier Martín
db53be75d2 Merge pull request #3096 from consul/backport-1630-fix_flaky_localization_specs 
Fix flaky localization specs
 2018-12-11 19:56:37 +01:00
Javi Martín
df29b49d05 Make milestones view reusable 2018-12-11 19:22:55 +01:00
Javi Martín
3e83b5893c Make milestone specs reusable 2018-12-11 19:22:55 +01:00
Javi Martín
64d6b7491a Make partial listing milestones reusable 
So it isn't specific to budget investments anymore.
 2018-12-11 19:22:55 +01:00
Javi Martín
6f342baf7d Move milestones scope to milestoneable concern 2018-12-11 19:22:55 +01:00
Javi Martín
abe8527e54 Randomize milestones per record in dev seeds 2018-12-11 19:22:55 +01:00
Javi Martín
1c531cfc00 Randomize milestones publication date in dev seeds 2018-12-11 19:22:55 +01:00
Javi Martín
2fdd367f22 Move milestone dev seeds to their own file 2018-12-11 19:22:55 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
9e759e0a39 Merge pull request #3043 from milber/content_blocks_for_headings 
Added feature to add content block to headings in sidebar
 2018-12-11 16:44:02 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
Javi Martín
b685419b28 Fix "Remove obsolete model usage" 
We accidentally changed the schema when modifying an existing migration.
It wasn't critical because we're going to remove that table in the
future, but it resulted in conflicts for users who had already run the
migration before its modification.

This commit fixes commit 4a7f479.
 2018-12-11 13:54:38 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals 
[Backport] Featured proposals
 2018-12-10 22:17:51 +01:00
Alberto
22790535c7 Merge pull request #3080 from consul/ui-design 
[Backport] UI design
 2018-12-10 22:16:32 +01:00
Javi Martín
34e83292a9 Reload I18n after stubbing available locales 
Not doing so might cause the following test to use translations for
only one locale. This scenario happens if the previous test executes
I18n.reload!, which resets I18n.config.backend's "@translations"
instance variable.

So, the sequence could be as follows:

1. The previous tests sets `@translations = nil`
2. This test stubs `available_locales` to `[:en]`
3. `@translations` gets only translations for `en`
4. The following test doesn't find translations for Spanish and fails
 2018-12-10 20:37:30 +01:00
Javier Martín
bd363466a8 Merge pull request #3089 from consul/backport-polls-show 
Polls voted by
 2018-12-10 20:19:26 +01:00
Javier Martín
64e8dbf67b Merge pull request #3094 from consul/fix_trailing_whitespace 
Remove trailing whitespace
 2018-12-10 20:15:24 +01:00
Javier Martín
414a8031a0 Merge pull request #3088 from consul/pull_request_template 
Simplify pull request template
 2018-12-10 20:08:10 +01:00
Javier Martín
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path 
Make milestones controller polymorphic
 2018-12-10 18:37:15 +01:00
Javier Martín
364321bf33 Merge pull request #3090 from consul/backport-time_related_specs 
[Backport] Add frozen time condition to proposals phase spec
 2018-12-10 13:47:38 +01:00
Javi Martín
aa45c39d3e Remove trailing whitespace 2018-12-10 12:59:03 +01:00
Javier Martín
ef16efe5e4 Merge pull request #2899 from papayalabs/2980-hide-featured-section-with-no-cards 
Hide Featured section on Home Page if there are no cards
 2018-12-10 12:55:32 +01:00
Raimond Garcia
3781a9920e Merge pull request #3093 from salbertson/patch-1 
Add a "Reviewed by Hound" badge
 2018-12-10 10:32:53 +01:00
Raimond Garcia
74f7be540f Merge pull request #3037 from PierreMesure/add-web-sections-to-seeds 
Add web sections to seeds
 2018-12-10 10:30:24 +01:00
Scott Albertson
be9e046d68 Add a "Reviewed by Hound" badge 2018-12-09 18:36:15 -08:00
Javi Martín
a769c61c02 Add frozen time condition to proposals phase spec 
Backport the part of AyuntamientoMadrid@ea6fcb5 which hadn't been
backported yet.
 2018-12-07 15:09:07 +01:00
Pierre Mesure
3fcd701723 Add websections at the end of the seeds 2018-12-07 14:48:21 +01:00
Javi Martín
6a5e5729dd Simplify pull request template 2018-12-07 13:57:32 +01:00
Javier Martín
d90f068c73 Merge pull request #3085 from consul/backport-1196-fix_flaky_legislation_random_order_spec 
Fix flaky spec: Legislation Proposals Each user has a different and consistent random proposals order
 2018-12-05 19:16:43 +01:00
Julian Nicolas Herrero
6ee8b328ef Merge pull request #3067 from microweb10/issue-3051 
Fix failing spec: Budget::Investment Reclassification store_reclassified_votes stores the votes for a reclassified investment
 2018-12-05 17:21:38 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00
Alberto Garcia Cabeza
54fbae6339 adds links to login or verification on question answers 2018-12-05 14:31:58 +01:00
Javier Martín
3631ff7340 Merge pull request #3074 from consul/backport-refactor_legislation_process_subnav 
Refactor legislation process subnav
 2018-12-05 13:32:22 +01:00
Javier Martín
fc5a5e58de Merge pull request #3073 from consul/backport-rename_hidden_proposals 
[Backport] Rename Admin::Proposals to Admin::HiddenProposals
 2018-12-05 13:30:23 +01:00
Julian Herrero
0fc1e0503e store reclassified votes in order 
Make sure we create Budget::ReclassifiedVotes for an investment in the
same order that the previous Budget::Ballot:Lines were previously created.
 2018-12-05 13:13:49 +01:00
Javi Martín
09add3554f Create less records in random pagination tests 
We make the tests considerably faster, we make them more robust against
changes in the number of records shown per page, and we generate enough
records so the chance of randomly getting the same results twice in a
row is extremely low.
 2018-12-05 13:11:23 +01:00
Javi Martín
64167a86b4 Be more consistent using double quotes 2018-12-05 13:11:23 +01:00
Javi Martín
637c188bee Make test easier to follow 
Checking the contents of the second page while on the second page makes
more sense than checking them after going back to the first page.
 2018-12-05 13:11:22 +01:00
Javi Martín
f391023b7d Group related specs together 2018-12-05 13:08:24 +01:00
Javi Martín
1b46ba9ee6 Make legislation proposals random seed more robust 
Using a number with only two decimals means the seed is going to be the
same 1% of the time. Using ruby's default value for random numbers makes
it almost impossible to generate the same seed twice.

Using `rand` also simplifies the code, and it's what we use in the
budget investments controller.
 2018-12-05 13:03:10 +01:00
Javi Martín
07c22d289c Change the random seed before storing it 
Even though it probably doesn't change the behaviour, it's a bit strange
to set a seed, then storing it in the session, and then modifying it
again.
 2018-12-05 13:03:10 +01:00
Javi Martín
6f62d76c71 Simplify random seed conversion to float 
The method `to_f` already returns `0.0` instead of raising an exception
when handling non-numeric values.
 2018-12-05 13:03:10 +01:00
Javi Martín
ba7ca11cd8 Fix buggy parallel assignment 
In ruby, when we assign two variables to one value, the second variable
is set to `nil`.
 2018-12-05 13:02:39 +01:00
Javi Martín
35c18688e5 Remove obsolete method 
It was used in the `Translatable` concern, but it isn't used there
anymore.
 2018-12-05 12:28:36 +01:00