Merge pull request #56 from sul-dlss/rails-42-blacklight-582

update for Rails 4.2 and Blacklight 5.8.2
projectblacklight · Jan 8, 2015 · a5f07ef · a5f07ef
2 parents 3152dc5 + e4e5964
commit a5f07ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
 notifications:
   email: false
-
+cache: bundler
+language: ruby
+sudo: false
 rvm:
+  - 2.2.0
   - 2.1.0
   - 2.0.0
   - 1.9.3

diff --git a/app/assets/stylesheets/blacklight_maps/default.css.scss b/app/assets/stylesheets/blacklight_maps/default.css.scss
@@ -1,9 +1,7 @@
-/*
-*= require leaflet
-*= require leaflet.markercluster
-*= require leaflet.markercluster.default
-*= require L.Control.Sidebar.css
-*/
+@import 'leaflet';
+@import 'leaflet.markercluster';
+@import 'leaflet.markercluster.default';
+@import 'L.Control.Sidebar';
 
 .view-icon-maps {
   &:before { content: "\e135"; } 

diff --git a/app/views/catalog/_index_maps.html.erb b/app/views/catalog/_index_maps.html.erb
@@ -3,7 +3,7 @@
   <%= render_thumbnail_tag document, {class: 'sidebar-thumb media-object'}, {class: 'pull-left'} %>
   <div class='media-body'>
     <h4 class='media-heading'>
-      <%= link_to_document document, :label=>document_show_link_field(document) %>
+      <%= link_to_document document, document_show_link_field(document) %>
     </h4>
   </div>
 </li>