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.

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

Deploy to Pro 🚀 #894

Merged
merged 127 commits into from
Sep 26, 2017
Merged

Deploy to Pro 🚀 #894

merged 127 commits into from
Sep 26, 2017

Conversation

bertocq
Copy link

@bertocq bertocq commented Sep 25, 2017

Deploying includes:

FEATURES:

FIXES:

Deployment:

Enter console and run
rake polls:migrate_final_recount_total_result

Senen and others added 30 commits September 11, 2017 14:39
Fixes #1848

On branch aperez-fix-for-issue-1848
  Changes to be committed:
    new file:   app/controllers/admin/poll/base_controller.rb
    modified:   app/controllers/admin/poll/booth_assignments_controller.rb
    modified:   app/controllers/admin/poll/booths_controller.rb
    modified:   app/controllers/admin/poll/officer_assignments_controller.rb
    modified:   app/controllers/admin/poll/officers_controller.rb
    modified:   app/controllers/admin/poll/polls_controller.rb
    modified:   app/controllers/admin/poll/questions_controller.rb
    modified:   app/controllers/admin/poll/recounts_controller.rb
    modified:   app/controllers/admin/poll/results_controller.rb
    modified:   app/controllers/admin/poll/shifts_controller.rb
…ere was a link for it, but no icons. The CSS file "theme" from jquery-ui was missing.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	nuevo archivo: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
Fixes #1831

On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   app/models/poll/question.rb
    modified:   spec/models/poll/question_spec.rb
    modified:   spec/features/admin/poll/polls_spec.rb
…of consul instead of icons from jquery-ui.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	borrado:       app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
…t-m2c/consul into iagirre-display-datepicker-arrows
… open. Moreover, when "Site custom" submenus are selected, the menu remains opened.
On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   spec/models/poll/question_spec.rb
@bertocq bertocq merged commit 78fc8fe into stable Sep 26, 2017
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.

None yet

7 participants