Skip to content

Commit

Permalink
Update Rails & Spotlight (#324)
Browse files Browse the repository at this point in the history
* Update Spotlight/Rails/Blacklight
  • Loading branch information
Trey Pendragon authored and escowles committed Mar 5, 2018
1 parent fce7ab8 commit cc31fcd
Show file tree
Hide file tree
Showing 27 changed files with 358 additions and 166 deletions.
2 changes: 2 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ RSpec/MessageExpectation:
# Offense count: 20
RSpec/MultipleExpectations:
Max: 4
Exclude:
- 'spec/models/iiif_resource_spec.rb'

# Offense count: 1
# Configuration parameters: MaxNesting.
Expand Down
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.4.3
1 change: 1 addition & 0 deletions .tool-versions-e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.3.6
16 changes: 8 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '5.0.0.1'
gem 'rails', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
gem 'coffee-rails'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

Expand Down Expand Up @@ -36,7 +36,7 @@ group :development, :test do
gem 'rspec-rails'
gem 'pry-rails'
gem 'pry-byebug'
gem 'simplecov', '~> 0.12', require: false
gem 'simplecov', require: false
gem 'coveralls', require: false
gem 'rubocop-rspec', require: false
gem 'vcr'
Expand Down Expand Up @@ -66,7 +66,7 @@ group :production do
end

gem 'rubocop', '~> 0.41', '>= 0.41.2', require: false
gem 'blacklight', '6.8.0'
gem 'blacklight', '6.14.1'
gem 'blacklight-spotlight', github: 'projectblacklight/spotlight', branch: "master"
gem 'solr_wrapper'
gem 'rsolr', '~> 1.0.6'
Expand All @@ -86,15 +86,15 @@ gem 'sidekiq'
gem 'redis-namespace'
gem 'string_rtl'
gem 'sprockets-es6'
gem 'sprockets-rails', '~> 2.3.3'
gem 'sprockets', '~> 3.5.0'
gem 'almond-rails', '~> 0.0.3'
gem 'sprockets-rails'
gem 'sprockets'
gem 'almond-rails', '~> 0.1'
gem 'pul_uv_rails', github: 'pulibrary/pul_uv_rails', branch: 'master'
gem 'riiif'

# PUL Assets
gem 'pul-assets', github: 'pulibrary/pul_assets'
gem 'spotlight-resources-iiif', github: 'pulibrary/spotlight-resources-iiif', branch: 'default_vocab'
# gem 'spotlight-resources-iiif', github: 'pulibrary/spotlight-resources-iiif', branch: 'default_vocab'
gem 'newrelic_rpm'
gem 'dalli'
gem 'ruby-prof', require: false
Expand Down
Loading

0 comments on commit cc31fcd

Please sign in to comment.