Skip to content

Commit

Permalink
Unpin sprockets and use fix found at rails/sprockets#597
Browse files Browse the repository at this point in the history
  • Loading branch information
dgcliff committed Oct 10, 2019
1 parent 5a02673 commit 74bfd4f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.7
0.6.8
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ gem 'sass-rails'
gem 'bootstrap', '~> 4.0'
gem 'jquery-rails'
gem 'rsolr'
gem 'sprockets', '< 4.0'
gem 'twitter-typeahead-rails'

# Blacklight
Expand Down
3 changes: 1 addition & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ GEM
nokogiri
stomp
xml-simple
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down Expand Up @@ -507,7 +507,6 @@ DEPENDENCIES
simple_form
simplecov
simplecov-shields-badge
sprockets (< 4.0)
twitter-typeahead-rails
valkyrie

Expand Down
4 changes: 2 additions & 2 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link application.css
//= link application.js

0 comments on commit 74bfd4f

Please sign in to comment.