Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LIBSCHOLAR-2 Adds OKComputer. #1169

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

LIBSCHOLAR-2 Adds OKComputer. #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ gem 'rack', '2.2.3'
gem 'sidekiq-limit_fetch'
gem 'willow_sword', github: 'notch8/willow_sword'

# Hyrax improvements
gem "okcomputer", "~> 1.18.4"

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.4.6'
# Use sqlite3 as the database for Active Record
Expand Down
6 changes: 4 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
okcomputer (1.18.5)
omniauth (1.9.2)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
Expand Down Expand Up @@ -1178,7 +1179,7 @@ DEPENDENCIES
brakeman
browse-everything (= 1.1.0)
bulkrax (~> 4.3.0)
bundler (~> 1.17)
bundler (= 2.4.22)
bundler-audit
byebug
capistrano (~> 3.10)
Expand Down Expand Up @@ -1209,6 +1210,7 @@ DEPENDENCIES
kaltura (= 0.1.1)
listen (~> 3.0.5)
mysql2 (~> 0.4.10)
okcomputer (~> 1.18.4)
omniauth-openid
omniauth-shibboleth
orcid!
Expand Down Expand Up @@ -1244,4 +1246,4 @@ DEPENDENCIES
willow_sword!

BUNDLED WITH
2.1.4
2.4.22
2 changes: 2 additions & 0 deletions config/initializers/okcomputer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# frozen_string_literal: true
OkComputer.mount_at = false
4 changes: 4 additions & 0 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
mount Sidekiq::Web => '/sidekiq'
end

authenticate :user, ->(u) { u.admin? } do
mount OkComputer::Engine, at: "/health"
end

devise_for :users, controllers: { omniauth_callbacks: 'callbacks', registrations: "registrations" }
mount Hydra::RoleManagement::Engine => '/'

Expand Down