Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consul Pull ⬇️ #912

Closed
wants to merge 59 commits into from
Closed

Consul Pull ⬇️ #912

wants to merge 59 commits into from

Conversation

bertocq
Copy link

@bertocq bertocq commented Oct 5, 2017 •
edited by voodoorai2000
Loading

Second try of #910

Consul PR's included:

Features:

Fixes:

FAILING SPECS:

  • spec/features/officing/booth_spec.rb
  • spec/features/proposals_spec.rb
  • spec/features/home_spec.rb

bertocq and others added 30 commits October 2, 2017 17:52
@bertocq
Update secrets.yml.example file
bc92b8d
@bertocq
Update deploy secrets example file
9260561
@bertocq
Merge branch 'master' into chore/update_secrets_example
5c4fb1b
@bertocq
Merge branch 'master' into chore/update_secrets_example
9432cd7
@aitbw
Adapt Poll::Question 'show' action to mockup
d9d0307
@aitbw
Create 'poll_question_answers' table
1d1b861
@aitbw
Create 'poll_question_answers' controller and views
1cc0816
@bertocq
Load the Booth polls instead of all current/incoming on Shift creatio…
15039b6 
…n for date ranges
@bertocq
Show only active polls from the shifts assigned to officer on vote panel
2900104
@voodoorai2000
Merge branch 'master' into aperez-admin-questions-section
44d0c04
@voodoorai2000
fixes specs
bf7cab2
@bertocq
Merge branch 'master' into fix/shift_creation_polls
e1a7fc5
@voodoorai2000
adds specs for answer's index and create
1f2aa30
Specs added for branch polls-show in consul and thumbnail for poll im…
4035097 
…ages in admins views.

 Cambios para hacer commit:
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    spec/features/admin/poll/polls_spec.rb
	modificado:    spec/features/polls/polls_spec.rb
@bertocq
Include the answerable by user scope back on Poll list for officer vo…
24ef798 
…ting panel
@voodoorai2000
adds consistency to answer's namespace
461410a
@decabeza
adds missing condition on polls callout partial
f2220c6
@decabeza
removes unnecessary polls partial
6bea0f2
@voodoorai2000
uses new answer model in user facing interface
4aaf681
@voodoorai2000
fixes specs
007bcb7
@bertocq
Fix poll Voter feature spec
c62b573
@voodoorai2000
removes unused translation
adda4f9
@decabeza
removes unused i18n keys
02ea701
@decabeza
Merge pull request #1981 from consul/polls-callout
75538ed 
Polls callout
@voodoorai2000
Merge pull request #1977 from wairbut-m2c/aperez-admin-questions-section
861b583 
Admin::Poll questions UI refactor
@voodoorai2000
fixes relation between questions and answers
3ae539e
@voodoorai2000
makes answer creation spec more robust
24fc7ab
@voodoorai2000
Merge branch 'master' into fix/shift_creation_polls
1b58b78
@voodoorai2000
Merge pull request #1982 from consul/polls-answer-polish
f9c35db 
Polls - create answer polish
@bertocq
Merge pull request #1979 from consul/fix/shift_creation_polls
ababdd0 
Fixes on Polls Shifts
voodoorai2000 and others added 22 commits October 4, 2017 23:56
@voodoorai2000
displays images for an answer
bba8cac
@voodoorai2000
removes extra space
52b68aa
@bertocq
Correct voter feature spec scenario name
895fc96
@bertocq
Merge pull request #1980 from wairbut-m2c/iagirre-polls-show
1e22108 
Specs added for branch polls-show in consul and thumbnail for poll im…
@bertocq
Merge pull request #1966 from consul/chore/update_secrets_example
6084899 
Update secrets and deploy secrets example files
@decabeza
improves layout for poll questions views
ea4b534
@decabeza
improves layout for poll questions answers views
acea19d
@decabeza
removes blank space
25de95c
@decabeza
adds line break on css
2e89224
@decabeza
fixes active classes on admin menu
d069d90
@decabeza
replaces lorem content on polls show
0ba2dbd
@decabeza
improves polls gallery partial
de27530
@decabeza
removes icons on polls index view
5fdbc7b
@decabeza
checks already answered polls only for users logged
ad8f589
@voodoorai2000
adds specs for answer's gallery
6327bcb
@voodoorai2000
adds pending specs
1922bc5
@voodoorai2000
spacing
82735ae
@voodoorai2000
removes rendering of local variable
127ab22
@bertocq
Merge pull request #1987 from consul/polls-index-icons
34503f2 
Polls index
@decabeza
Merge pull request #1990 from consul/polls-gallery
806fd85 
Polls Gallery
@bertocq
Merge remote-tracking branch 'upstream/master' into upstream_two
3bfd595
@bertocq
Fixes over upstream merge conflcits and specs
fa252bf
@bertocq bertocq mentioned this pull request Oct 5, 2017
Closed
@voodoorai2000
Copy link

Closed in favor of #918

@bertocq bertocq deleted the upstream_two branch October 8, 2017 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bertocq @voodoorai2000 @aitbw @decabeza