Merge pull request rughh#155 from arthurnn/bump_slim-rails

Bump slim-rails to 3.x

Author: phoet

Gemfile

@@ -7,7 +7,7 @@ gem "rails",                  "~> 4.1.0"
 gem "rails-observers",        "~> 0.1.2"
 gem "pg",                     "~> 0.17.1"
 gem "rack-cache",             "~> 1.2"
-gem "slim-rails",             "~> 2.0"
+gem "slim-rails",             "~> 3.0"
 gem "redcarpet",              "~> 3.0"
 gem "friendly_id",            "~> 5.0.2"
 gem "omniauth",               "~> 1.2.1"

Gemfile.lock

@@ -112,11 +112,11 @@ GEM
     heroku-deflater (0.5.3)
       rack (>= 1.4.5)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     jwt (1.0.0)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
@@ -141,7 +141,7 @@ GEM
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.0)
-    minitest (5.4.3)
+    minitest (5.5.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -210,7 +210,7 @@ GEM
       rack (>= 0.4)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.8)
       actionmailer (= 4.1.8)
@@ -235,7 +235,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.0)
+    rake (10.4.2)
     redcarpet (3.1.2)
     ri_cal (0.8.8)
     rspec-collection_matchers (1.1.2)
@@ -268,14 +268,15 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slim (2.0.3)
-      temple (~> 0.6.6)
+    slim (3.0.1)
+      temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
-    slim-rails (2.1.5)
-      actionpack (>= 3.0, < 4.2)
-      activesupport (>= 3.0, < 4.2)
-      railties (>= 3.0, < 4.2)
-      slim (~> 2.0)
+    slim-rails (3.0.1)
+      actionmailer (>= 3.1, < 5.0)
+      actionpack (>= 3.1, < 5.0)
+      activesupport (>= 3.1, < 5.0)
+      railties (>= 3.1, < 5.0)
+      slim (~> 3.0)
     slop (3.6.0)
     spring (1.1.3)
     spring-commands-rspec (1.0.2)
@@ -289,7 +290,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    temple (0.6.8)
+    temple (0.7.5)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -360,7 +361,7 @@ DEPENDENCIES
   rspec-collection_matchers
   rspec-rails
   sass-rails (~> 4.0.3)
-  slim-rails (~> 2.0)
+  slim-rails (~> 3.0)
   spring
   spring-commands-rspec
   typus!

app/views/events/show.slim

@@ -5,10 +5,10 @@ section
   p.meta
     span
       = fa_icon('calendar', class: 'fa-fw')
-      =' link_to l(event.date, format: :long), event_path(event, format: :ics), title: event.name, class: 'ical'
+      => link_to l(event.date, format: :long), event_path(event, format: :ics), title: event.name, class: 'ical'
       - if signed_in?
-        ==' "(#{calendar_link})"
-    =' t("show.hosted_by")
+        ==> "(#{calendar_link})"
+    => t("show.hosted_by")
     = link_to_user event.user
   p.meta
     = fa_icon('map-marker', class: 'fa-fw')

app/views/home/_events.slim

@@ -1,7 +1,7 @@
 = section_box :events do
   - if current_event
     p
-      =' link_to t("home.next_meetup"), current_event, title: current_event.name
+      => link_to t("home.next_meetup"), current_event, title: current_event.name
       - if current_event.location.present?
         == t("home.takes_place", event_date: content_tag(:em, l(current_event.date)), location_link: link_to(current_event.location.name, current_event.location, title: current_event.location.name))
       - else

app/views/home/_topics.slim

@@ -1,6 +1,6 @@
 = section_box :topics do
   p
-    strong=' I18n.tw("home.like_to_talk")
+    strong=> I18n.tw("home.like_to_talk")
     == t("home.send_us_an_email", mail_to: mail_to(Whitelabel[:email], "E-Mail", title: "E-Mail"))
   = render 'users/list', users: organizers
   p== I18n.tw("home.engage")

app/views/locations/none.de.slim

@@ -6,17 +6,17 @@ section
   p
     ' Usergroups suchen immer nach einem zu Hause für ihre Treffen.
     ' Wenn du oder deine Firma ein Treffen ausrichten möchte, dann
-    =' mail_to Whitelabel[:email], "schicke uns einfach eine E-Mail", title: "#{Whitelabel[:twitter]} E-Mail"
+    => mail_to Whitelabel[:email], "schicke uns einfach eine E-Mail", title: "#{Whitelabel[:twitter]} E-Mail"
     ' oder erwähne uns unter #{link_to_twitter Whitelabel[:twitter]}
     ' oder wende dich an unsere Ansprechpartner:
   = render 'users/list', users: organizers
 
   h3 Wie viele Plätze werden gebraucht?
   p
     ' Bei den letzten Treffen haben sich im
-    em' Durchschnitt #{stats[:participants]} Teilnehmer
+    em> Durchschnitt #{stats[:participants]} Teilnehmer
     ' angemeldet und es wurden ungefähr
-    em' #{stats[:topics]} bis #{stats[:topics] + 1} Themen
+    em> #{stats[:topics]} bis #{stats[:topics] + 1} Themen
     ' vorgestellt.
     ' Die Tatsächliche Anzahl der Teilnehmer ist kann allerdings stark abweichen,
     ' deshalb am besten immer Rücksprache mit den Organisatoren halten.

app/views/shared/_footer.slim

@@ -29,7 +29,7 @@ section.clearfix
       ol.clearfix
         - other_usergroups.each do |ug|
           li
-            =' link_to ug[:name], ug[:url], title: ug[:name]
+            => link_to ug[:name], ug[:url], title: ug[:name]
             = link_to_twitter(ug[:twitter], clung: true) if ug[:twitter]
 
   .railsgroups.block.hr
@@ -38,7 +38,7 @@ section.clearfix
       - Whitelabel.labels.each do |label|
         li
           - name = t("label.#{label.label_id}.name")
-          =' link_to name, label_url(label), title: name
+          => link_to name, label_url(label), title: name
           = link_to_twitter(label.twitter, clung: true)
 
   .railssupporters.block

app/views/shared/_hint.slim

@@ -9,7 +9,7 @@
         = hint(false) do
           - highlights.each do |highlight|
             .highlights
-              strong=' t("hint.attention")
+              strong=> t("hint.attention")
               = link_to highlight.description, highlight.url, title: highlight.description
   - elsif jobs.present?
     - unless current_user && current_user.hide_jobs?

app/views/shared/_nav.slim

@@ -24,22 +24,22 @@ nav#nav.navbar
             li
               = link_to edit_user_path(current_user) do
                 = fa_icon 'edit', class: 'fa-fw dropdown-list-icon'
-                =' t("login.edit_profile")
+                => t("login.edit_profile")
             li
               = link_to destroy_session_path(current_user) do
                 = fa_icon 'times', class: 'fa-fw dropdown-list-icon'
-                =' t("login.logout")
+                => t("login.logout")
           - else
             - [:twitter, :github].each do |provider|
               - title = t("login.#{provider}_login")
               li.provider
                 = link_to auth_path(provider: provider) do
                   = fa_icon provider, class: 'fa-fw dropdown-list-icon'
-                  =' title
+                  => title
 
           - (I18n.available_locales - [I18n.locale]).each do |locale|
             - title = t("languages.#{locale}")
             li.locale
               = link_to url_for(locale: locale), title: t("switch_languages", language: title) do
                 = fa_icon 'comment', class: 'fa-fw dropdown-list-icon'
-                =' title
+                => title