Merge branch 'staging'

2017-07-17 15:13:31 +06:30
parent 6f57bb8a79 bd0b8681c9
commit df06b81b28
58 changed files with 1375 additions and 1252 deletions
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -4,8 +4,6 @@ class Origami::ShiftsController < BaseOrigamiController
  end

  def show
-    puts ">>>>>"
-    puts current_user.id
    @shift = ShiftSale.current_open_shift(current_user.id)
  end