Merge branch 'master' into call_for_booths

This commit is contained in:
Stella Rouzi 2017-07-14 13:28:18 +03:00 • committed by GitHub
commit 8de3da97bb
33 changed files with 1285 additions and 117 deletions

View file

@ -172,6 +172,9 @@ linters:
- "app/views/users/edit.html.haml"
- "app/views/users/show.html.haml"
- "app/views/admin/cfps/index.html.haml"
- "app/views/tracks/_form.html.haml"
- "app/views/tracks/index.html.haml"
- "app/views/tracks/show.html.haml"
# Offense count: 223
InstanceVariables:
@ -232,6 +235,7 @@ linters:
- "app/views/schedules/_schedule_item.html.haml"
- "app/views/schedules/_schedule_tabs.html.haml"
- "app/views/admin/cfps/_events_cfp.html.haml"
- "app/views/tracks/_form.html.haml"
# Offense count: 32
IdNames:
@ -331,6 +335,8 @@ linters:
- "app/views/shared/_object_changes.html.haml"
- "app/views/tickets/_ticket.html.haml"
- "app/views/tickets/index.html.haml"
- "app/views/tracks/index.html.haml"
- "app/views/tracks/show.html.haml"
# Offense count: 23
ClassesBeforeIds: