* 'master' of github.com:snap-cloud/snapcon: (22 commits)
Cleanup some Auth specs and weird haml syntax
add sentry puma hooks
fix user model spec
Tweak Tickets Text
fix missing ]
Fix specs for omniauth providers?
Update stripe mock gem
remove airbrake
Add sentry logging
Update stripe gem
Cleanup stripe stuff
Fix the docker init script
Cleanup specs
Cleanup config file, ensure providers are set if present
Fix format spec with new markdown options
Try to update spec file with image in navbar
Delint
Delint helpers
Lint: Sort gems
Update user model spec
...
* master: (61 commits)
Replace more Commercials with Materials
Rename more commericals to materials
UI -- Repalce "Commerials" with "Materials".
Re-order Conference Associations
Cleanup CSS add Snap! style block attachments
hide venue link if there is no venue link
No dropshadow
Text with drop shadow for now
Tidy up the look of lodging panels
Show reg status for tickets.
Tweak CSS, fix loding order
Move the venue description to below the map.
Update lodging styling. Add description for venu when map is shown.
CSS tweaks...
Make the edit form not so wide.
Support markdown in more fields
Cleanup CSS ordering, fix coloring for navdropdowns
dumb...fix order of link_to args
ARRRGHHH, another typo...same line...
fix typo
...
The current order leads to an error on the route
GET /conferences/:short_name/physical_tickets
The Rails error message was rather helpful! 😁
```
Completed 500 Internal Server Error in 35ms (ActiveRecord: 12.0ms)
ActiveRecord::HasManyThroughOrderError (Cannot have a has_many :through association 'Conference#physical_tickets' which goes through 'Conference#ticket_purchases' before the through association is defined.):
app/controllers/admin/physical_tickets_controller.rb:11:in `index'
```
