Merge 69ca4d4 into 4b52320

.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-07-10 10:12:37 -0500 using RuboCop version 0.58.1.
+# on 2018-06-01 13:11:57 -0500 using RuboCop version 0.56.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
@@ -737,7 +737,7 @@ Style/ExpandPathArguments:
     - 'script/rails'
     - 'spec/spec_helper.rb'
 
-# Offense count: 170
+# Offense count: 171
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: when_needed, always, never
@@ -930,7 +930,7 @@ Style/ParenthesesAroundCondition:
     - 'app/models/hydrus/object_file.rb'
     - 'lib/hydrus/access_controls_enforcement.rb'
 
-# Offense count: 126
+# Offense count: 127
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -1156,7 +1156,7 @@ Style/WordArray:
 Style/ZeroLengthPredicate:
   Enabled: false
 
-# Offense count: 914
+# Offense count: 900
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

Gemfile

@@ -8,27 +8,25 @@ gem 'devise-remote-user', '~> 1.0'
 gem 'jquery-rails'
 gem 'dynamic_form'
 gem 'bootstrap-datepicker-rails'
-gem 'cancan'
 gem 'carrierwave', '~> 1.0'
 gem 'coderay'
 gem 'validates_email_format_of'
 gem 'whenever', '~> 0.9'
 
 # Stanford stuff
 gem 'assembly-objectfile', '~> 1.5'
-gem 'blacklight',   '~> 4.4'
-gem 'dor-services', '~> 5.24', require: false
+gem 'dor-services', '~> 5.31', require: false
+gem 'rubydora', '~> 2.1'
 gem 'bagit', '~> 0.4'
 gem 'dor-workflow-service'
 gem 'net-http-persistent', '~> 2.9' # https://github.com/sul-dlss/dor-workflow-service/issues/44
-gem 'hydra-head', '~> 6.5'
+gem 'hydra-head', '~> 7.0'
 
 # Use okcomputer to monitor the application
 gem 'okcomputer'
 
-gem 'sass-rails',     '~> 4.0'
+gem 'sass-rails',     '~> 5.0'
 gem 'coffee-rails',   '~> 4.2'
-gem 'bootstrap-sass', '2.3.2.1'
 gem 'uglifier', '>= 1.0.3'
 
 # gems only needed for particular environments