scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-31 03:59:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3737 from okriuchykhin/ok_SCI_6184_v2

Browse source 
Improve database and Okta config [SCI-6184]
This commit is contained in:
Alex Kriuchykhin 2021-12-13 10:48:01 +01:00 committed by GitHub
commit 1e652c0a73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/database.yml
View file

@ -17,8 +17,8 @@
default: &default
adapter: postgresql
encoding: unicode
database: postgres
pool: <%= ENV['DB_POOL'] || ENV['RAILS_MAX_THREADS'] || 5 %>
url: <%= ENV['DATABASE_URL'] %>
# For details on connection pooling, see rails configuration guide
# http://guides.rubyonrails.org/configuring.html#database-pooling
@ -80,7 +80,7 @@ test: &test
# url: <%= ENV['DATABASE_URL'] %>
#
production:
url: <%= ENV['DATABASE_URL'] %>
<<: *default
cucumber:
<<: *test

2
config/initializers/devise.rb
View file

@ -295,7 +295,7 @@ Devise.setup do |config|
config.omniauth :linkedin, ENV['LINKEDIN_KEY'], ENV['LINKEDIN_SECRET'], scope: 'r_liteprofile r_emailaddress'
end
if [ENV['OKTA_CLIENT_ID'], ENV['OKTA_CLIENT_SECRET'], ENV['OKTA_DOMAIN'], ENV['OKTA_AUTH_SERVER_ID']].all?
if [ENV['OKTA_CLIENT_ID'], ENV['OKTA_CLIENT_SECRET'], ENV['OKTA_DOMAIN'], ENV['OKTA_AUTH_SERVER_ID']].all?(&:present?)
config.omniauth(
:okta,
ENV['OKTA_CLIENT_ID'],