Merge branch 'master' of https://github.com/openSUSE/osem

app/assets/stylesheets/osem-dashboard.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 .dashbox span.fa {
   line-height: 1.1em;

app/assets/stylesheets/osem-navbar.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 .nav-osem {
     border: none;
     @include breakpoint(xs) {

app/assets/stylesheets/osem-splash.scss

@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 #splash {
   // Counter the general padding for #content

app/views/admin/venues/show.html.haml

@@ -8,7 +8,7 @@
   .row
     .col-md-6
       - if @conference.venue.location?
-        = render '/conferences/venue_map'
+        = render '/conferences/venue_map', venue: @conference.venue
       -else
         - if @venue.commercial.nil?
           .row

app/views/booths/show.html.haml

@@ -6,7 +6,7 @@
           = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
         = @booth.title
         .btn-group.pull-right
-          = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
+          = link_to 'Edit', edit_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
 
   .row
     .col-md-12

docker-compose.env.example

@@ -34,7 +34,7 @@ SECRET_KEY_BASE=changemechangemechangeme"
 OSEM_EMAIL_ADDRESS="osem@mailhog"
 OSEM_SMTP_AUTHENTICATION="login"
 OSEM_SMTP_ADDRESS="mailhog"
-OSEM_SMTP_PORT="1025"
+OSEM_SMTP_PORT=1025
 OSEM_SMTP_USERNAME="mailhog"
 OSEM_SMTP_PASSWORD="mailhog"