Merge branch 'master' into rebased_1530

2017-08-23 18:58:02 +00:00 · 2017-08-23 18:58:02 +00:00 · aebdd66034
commit aebdd66034
parent 2ff086ef0d 7af712f492
12 changed files with 90 additions and 24 deletions
--- a/app/controllers/admin/booths_controller.rb
+++ b/app/controllers/admin/booths_controller.rb
@ -90,6 +90,10 @@ module Admin
      update_state(:cancel, 'Booth is canceled')
    end

+    def confirm
+      update_state(:confirm, 'Booth successfully confirmed')
+    end
+
    private

    def update_state(transition, notice)