Skip to content

Commit

Permalink
Update hyrax and other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Jun 5, 2017
1 parent 84f67ac commit fbd6606
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 30 deletions.
45 changes: 21 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
GIT
remote: https://github.com/projecthydra-labs/hyrax.git
revision: 211d3ef43f221719783f92f011514f2dc135886a
revision: a53ea53861cd90ea6d2438d6d04138980d83f813
specs:
hyrax (2.0.0.alpha)
active-fedora (>= 11.1.3)
active_attr (~> 0.9)
active_fedora-noid (~> 2.0, >= 2.0.2)
almond-rails (~> 0.1)
awesome_nested_set (~> 3.1)
Expand Down Expand Up @@ -86,9 +85,6 @@ GEM
activesupport (>= 3.0.0)
rdf (~> 2.0, >= 2.0.2)
rdf-vocab
active_attr (0.10.1)
activemodel (>= 3.0.2, < 5.2)
activesupport (>= 3.0.2, < 5.2)
active_elastic_job (2.0.1)
aws-sdk (~> 2)
rails (>= 4.2)
Expand Down Expand Up @@ -126,13 +122,13 @@ GEM
execjs
awesome_nested_set (3.1.3)
activerecord (>= 4.0.0, < 5.2)
aws-sdk (2.9.28)
aws-sdk-resources (= 2.9.28)
aws-sdk-core (2.9.28)
aws-sdk (2.9.29)
aws-sdk-resources (= 2.9.29)
aws-sdk-core (2.9.29)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.9.28)
aws-sdk-core (= 2.9.28)
aws-sdk-resources (2.9.29)
aws-sdk-core (= 2.9.29)
aws-sigv4 (1.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
Expand Down Expand Up @@ -197,9 +193,9 @@ GEM
carrierwave (>= 0.7, < 2.0)
clipboard-rails (1.6.1)
cliver (0.3.2)
coffee-rails (4.2.1)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
Expand Down Expand Up @@ -386,8 +382,8 @@ GEM
inflecto (0.0.2)
is_it_working (1.1.0)
iso-639 (0.2.8)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jmespath (1.3.1)
jquery-datatables-rails (3.4.0)
Expand All @@ -402,7 +398,7 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (2.1.0)
json-ld (2.1.3)
json-ld (2.1.4)
multi_json (~> 1.12)
rdf (~> 2.2)
json-schema (2.8.0)
Expand Down Expand Up @@ -489,7 +485,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.7.0)
mini_portile2 (2.1.0)
mini_portile2 (2.2.0)
minitest (5.10.2)
mods (2.1.0)
iso-639
Expand All @@ -503,8 +499,8 @@ GEM
net-http-persistent (2.9.4)
nio4r (2.1.0)
noid (0.9.0)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
nom-xml (0.6.0)
activesupport (>= 3.2.18)
i18n
Expand Down Expand Up @@ -562,7 +558,7 @@ GEM
power_converter (0.1.2)
powerpack (0.1.1)
public_suffix (2.0.5)
puma (3.8.2)
puma (3.9.1)
qa (1.1.0)
activerecord-import
deprecation
Expand Down Expand Up @@ -676,7 +672,7 @@ GEM
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
retriable (3.0.2)
riiif (1.4.0)
riiif (1.4.1)
railties (>= 4.2, < 6)
rolify (5.1.0)
rsolr (2.0.2)
Expand Down Expand Up @@ -734,7 +730,7 @@ GEM
useragent
select2-rails (3.5.10)
thor (~> 0.14)
sidekiq (5.0.0)
sidekiq (5.0.2)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand All @@ -758,8 +754,9 @@ GEM
httparty (>= 0.11.0)
oauth2 (>= 0.9.2)
slop (4.5.0)
solr_wrapper (1.0.0)
solr_wrapper (1.1.0)
faraday
retriable
ruby-progressbar
rubyzip
solrizer (3.4.1)
Expand Down Expand Up @@ -835,7 +832,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xml-simple (1.1.5)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)
zk (1.9.6)
zookeeper (~> 1.4.0)
Expand Down Expand Up @@ -906,4 +903,4 @@ DEPENDENCIES
zk

BUNDLED WITH
1.14.6
1.15.1
6 changes: 0 additions & 6 deletions app/controllers/hyrax/file_sets_controller.rb

This file was deleted.

1 change: 1 addition & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Application < Rails::Application
# Before moving this here (from an initializer) Devise was raising invalid
# authenticity token errors.
Hyrax::Admin::AppearancesController.form_class = AppearanceForm
Hyrax::FileSetsController.show_presenter = Hyku::FileSetPresenter
end

config.before_initialize do
Expand Down

0 comments on commit fbd6606

Please sign in to comment.