Merge pull request #1224 from OregonDigital/update/hyrax3-rc1

Update to Hyrax 3.0.0-RC1

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
             - v2-bundle-{{ checksum "Gemfile.lock" }}
       - run:
           name: Update bundler
-          command: gem install bundler -v 1.17.2
+          command: gem install bundler -v 2.1.4
       - run:
           name: Install dependencies
           command: bundle check || bundle install
@@ -64,6 +64,9 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
+      - run:
+          name: Update bundler
+          command: gem install bundler -v 2.1.4
       - run: bundle exec rubocop
   test:
     docker:
@@ -119,6 +122,9 @@ jobs:
             zip -1 -r solr_hyrax_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
             curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'
+      - run:
+          name: Update bundler
+          command: gem install bundler -v 2.1.4
       - run:
           name: Wait for DB
           command: dockerize -wait tcp://localhost:5432 -timeout 1m

.gitignore

@@ -34,6 +34,7 @@ coverage/*
 
 /public/system
 /public/branding
+/public/uv
 
 /vendor/bundle
 .byebug_history

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.5 as bundler
+FROM ruby:2.5.8 as bundler
 
 # Necessary for bundler to operate properly
 ENV LANG C.UTF-8

Gemfile

@@ -13,8 +13,8 @@ gem 'browse-everything'
 # been added to either gemspecs
 gem 'coffee-rails', '~> 4.2'
 gem 'devise'
-gem 'hydra-role-management', '~> 1.0.2'
-gem 'hyrax', github: 'samvera/hyrax', tag: 'v2.7.0'
+gem 'hydra-role-management'
+gem 'hyrax', '3.0.0-rc1'
 gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master'
 gem 'jquery-rails'
 gem 'pg'