Merge branch 'develop' into feature/300-incoming-webhook

# Conflicts:
#	package.json
#	webpack.mix.js
#	yarn.lock

resources/views/ejaculation/show.blade.php

@@ -102,13 +102,13 @@
         削除確認
     @endslot
     <span class="date-label"></span> のチェックインを削除してもよろしいですか？
-    <form action="{{ route('checkin.destroy', ['id' => '@']) }}" method="post">
-        {{ csrf_field() }}
-        {{ method_field('DELETE') }}
-    </form>
     @slot('footer')
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">キャンセル</button>
-        <button type="button" class="btn btn-danger">削除</button>
+        <form action="{{ route('checkin.destroy', ['id' => '@']) }}" method="post">
+            {{ csrf_field() }}
+            {{ method_field('DELETE') }}
+            <button type="button" class="btn btn-secondary" data-dismiss="modal">キャンセル</button>
+            <button type="submit" class="btn btn-danger">削除</button>
+        </form>
     @endslot
 @endcomponent
 @endsection