Skip to content

Commit

Permalink
Gems: drop blazer for a second...
Browse files Browse the repository at this point in the history
  • Loading branch information
ewlarson committed Jan 10, 2024
1 parent e9df65f commit 9982da2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 22 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
strategy:
matrix:
ruby: ['3.0']
rails_version: [7.0.8]

services:
postgres:
Expand Down Expand Up @@ -44,7 +45,7 @@ jobs:
- name: Bundler - Install dependencies
run: bundle _2.3.5_ install
env:
rails_version: 7.0.8
RAILS_VERSION: ${{ matrix.rails_version }}

- name: Node - v14
uses: actions/setup-node@v2
Expand All @@ -71,7 +72,7 @@ jobs:
- name: Rails - Run tests
env:
RAILS_ENV: test
RAILS_VERSION: 7.0.8
RAILS_VERSION: ${{ matrix.rails_version }}
RUBYOPT: W0
SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
FARADAY_VERSION: ${{ matrix.faraday_version }}
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ gem 'devise-guests', '~> 0.6'
gem 'devise_invitable', '~> 2.0.0'

# Reporting
gem 'blazer'
# gem 'blazer'

gem 'haml'
gem 'chronic'
Expand Down
8 changes: 0 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,6 @@ GEM
jquery-rails
rails (>= 3.0)
tether-rails
blazer (3.0.2)
activerecord (>= 6.1)
chartkick (>= 5)
railties (>= 6.1)
safely_block (>= 0.4)
bootsnap (1.9.4)
msgpack (~> 1.0)
bootstrap (4.6.2)
Expand All @@ -187,7 +182,6 @@ GEM
capybara-selenium (0.0.6)
capybara
selenium-webdriver
chartkick (5.0.5)
chosen-rails (1.10.0)
coffee-rails (>= 3.2)
railties (>= 3.0)
Expand Down Expand Up @@ -627,7 +621,6 @@ GEM
ruby-vips (2.2.0)
ffi (~> 1.12)
rubyzip (2.3.2)
safely_block (0.4.0)
sanitize (6.1.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand Down Expand Up @@ -773,7 +766,6 @@ DEPENDENCIES
blacklight (~> 7.33.0)
blacklight_advanced_search!
blacklight_range_limit (~> 7.0.0)
blazer
bootsnap (~> 1.9.3)
bootstrap (~> 4.0)
byebug
Expand Down
14 changes: 6 additions & 8 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ development:
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: postgresql
encoding: utf8
pool: 5
timeout: 5000
host: <%= ENV['POSTGRES_HOST'] || '127.0.0.1' %>
port: <%= ENV['POSTGRES_PORT'] || '5432' %>
username: <%= ENV['POSTGRES_USER'] || 'postgres' %>
password: <%= ENV['POSTGRES_PASSWORD'] || 'postgres' %>
<<: *default
host: "<%= ENV['POSTGRES_HOST'] %>"
port: "<%= ENV['POSTGRES_PORT'] %>"
database: "<%= ENV['POSTGRES_DATABASE'] %>"
username: "<%= ENV['POSTGRES_USER'] %>"
password: "<%= ENV['POSTGRES_PASSWORD'] %>"

production:
# Puma is given a lot of threads
Expand Down
6 changes: 3 additions & 3 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@
mount ActionCable.server => "/cable"

# @TODO
authenticate :user, ->(user) { user } do
mount Blazer::Engine, at: "blazer"
end
# authenticate :user, ->(user) { user } do
# mount Blazer::Engine, at: "blazer"
# end
end

# Blog redirects
Expand Down

0 comments on commit 9982da2

Please sign in to comment.