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.

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

Update GBL to 4.0 #279

Merged
merged 96 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
02bd660
update bundle
Aug 8, 2023
2fb18fe
remove unneeded helper and lint
Aug 8, 2023
6b88a2d
update GH workflow and correct namespace
Aug 8, 2023
e74e511
update views and version #
Aug 8, 2023
2ea06cf
more test linting
Aug 8, 2023
a4a10f7
fix zeitwerk error
Aug 8, 2023
a26c1a6
lint
Aug 9, 2023
103fc93
add linting for Rspec/Capybara
Aug 14, 2023
780fe4f
update gemfile with SDR CLI tool
Aug 14, 2023
00b6f5e
remove dot-env
Aug 14, 2023
9dae45f
update SDR CLI gem
Aug 14, 2023
7c5d5ea
fix SDR CLI dependencies
Aug 14, 2023
9598d76
fix database YAML file
Aug 14, 2023
8aaf9d7
add token verifier for Omniauth 2.0
Aug 15, 2023
cf3ad75
downgrade omniauth
Aug 15, 2023
9f3a229
lint
Aug 15, 2023
0407f2e
match oauth2 with main
Aug 15, 2023
580543f
update gems...again
Aug 15, 2023
0bd88d3
update to Oauth 2.0
Aug 15, 2023
9397b4d
update OmniAuth config and fix guest params
Aug 16, 2023
cfe5b34
update Gemfile
Aug 17, 2023
7c9b445
more troubleshooting OAuth
Aug 17, 2023
579d2c4
make config pretty
Aug 17, 2023
c86a031
move all OAuth2 configs to Devise
Aug 17, 2023
14d19ac
add missing auth code config
Aug 17, 2023
f5e161c
I am getting tired of this
Aug 17, 2023
ddeed3f
more config woes
Aug 17, 2023
761d338
am i dumb?
Aug 17, 2023
d3e8119
move options around
Aug 17, 2023
272434f
manually setting redirect uri
Aug 17, 2023
edef78b
downgrade omniauth-oauth2 to 1.6
Aug 17, 2023
e27e00e
omniauth die
Aug 17, 2023
b50832a
clobber callback url
Aug 18, 2023
4517332
fix broken #from_omniauth
Aug 18, 2023
ff26ceb
use info hash
Aug 18, 2023
c701767
user method still broken
Aug 18, 2023
de64920
add anon user data and render name in UI
Aug 21, 2023
d5b9a38
update SDR::CLI
Aug 23, 2023
c3f9507
update sdr_cli
Aug 24, 2023
682da9c
refactor login path where it is not fixed
Aug 30, 2023
8390140
add accessibility spec tools and 1st pass at a11y compliance
Aug 31, 2023
d722399
bundle lock and fix broken test
Aug 31, 2023
daf31c9
make collections clickable again
Aug 31, 2023
08beef1
lint
Aug 31, 2023
8b83578
override _home_text partial
Aug 31, 2023
70e769b
add BBOX
Sep 1, 2023
edc4fbb
OGM crosswalk blues
Sep 1, 2023
acdfb8f
override search SVG and style viewbox
Sep 1, 2023
591ffe8
update settings
Sep 5, 2023
2225293
update settings
Sep 5, 2023
0ae0d21
refactor tests...again
Sep 6, 2023
6327d59
ensure accessibility tests pass
Sep 6, 2023
fe375b1
add multi-downloads field
Sep 6, 2023
3683255
remove superfluous files
Sep 6, 2023
3e89109
update Gemfile
Sep 7, 2023
9cd076c
update SDR CLI
Sep 7, 2023
916f211
rubocop again...
Sep 8, 2023
846249d
refactor a11y specs
Sep 8, 2023
f438371
update catalog link
Sep 11, 2023
095f248
update fixtures to use proper geometry field
Sep 11, 2023
7fb396d
update INSTITUTION to proper institution
Sep 11, 2023
43f4ee9
passing tests
Sep 11, 2023
7d43fcb
add weight to <a> tag for a11y
Sep 11, 2023
0610eac
update rails per ruby-advisory-db
Sep 11, 2023
1505b98
update _show_downloads partial with proper link
Sep 13, 2023
6a2a4bd
make login path POST
Sep 13, 2023
365e6a3
add capistrano gem and init
Sep 14, 2023
43c5fe9
update cap file and configs
Sep 14, 2023
825c951
update secrets
Sep 14, 2023
74be7e5
more Capistrano tweaks
Sep 14, 2023
ff358d2
create passing Capistrano staging build
Sep 14, 2023
3b5f5b9
fix broken SDR task
Sep 20, 2023
14da844
update Geoblacklight helper to use file names instead of i18n
Oct 4, 2023
eb538aa
link settings dir
Oct 4, 2023
add31a0
add proxy and restricted URLs to settings
Oct 11, 2023
25c88ed
add Collection link to Show facet
Oct 11, 2023
ba4765c
add additional search formats
Oct 11, 2023
6f9a617
update gemfile
Oct 16, 2023
17dc07d
update SDR CLI again
Oct 16, 2023
db08662
lint
Oct 16, 2023
e7dc6a9
update SDR CLI
Oct 17, 2023
afa6a52
turn on facets with links
Oct 30, 2023
dc1b413
add missing viewers for polygon rendering
Oct 30, 2023
2e16ca4
update settings and Gemfile
Oct 30, 2023
57c8b3f
update Gemfile (SDR CLI)
Oct 31, 2023
3854cc6
update controller settings to make facets clickable
Oct 31, 2023
604ad0e
update vendor JS files
Nov 1, 2023
1d84cb3
make Leaflet great again
Nov 2, 2023
078fa29
need to manually declare?
Nov 3, 2023
e1009f3
update settings to make retina rendering work
Nov 3, 2023
5d8e1b7
more dumb Settings shit
Nov 9, 2023
dfb3164
add production deploy config
Nov 21, 2023
997d8f1
rubocop linting
Nov 21, 2023
361b5ec
rubocop lint
Nov 21, 2023
6f2e6c7
restore multi-downloads
Nov 21, 2023
95d3d9e
rubocop fixes
Nov 21, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
run: bundle exec rubocop
- name: Run tests
run: |
cp config/vars.yml.example config/vars.yml
bundle exec rake db:schema:load
bundle exec rake ci
- name: Audit gems
Expand Down
8 changes: 8 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
require:
- rubocop-rails
- rubocop-performance
- rubocop-rspec
- rubocop-capybara

AllCops:
Exclude:
- 'db/**/*'
- 'bin/*'
- 'config/**/*'
- 'vendor/**/*'
- 'Vagrantfile'
- 'app/helpers/geoblacklight_helper.rb'
NewCops: enable

Style/Documentation:
Enabled: false
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.2.2
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ruby 2.7.8
ruby 3.2.2
nodejs 18.10.0
38 changes: 38 additions & 0 deletions Capfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Load DSL and set up stages
require 'capistrano/setup'

# Include default deployment tasks
require 'capistrano/deploy'

# Load the SCM plugin appropriate to your project:
#
# require "capistrano/scm/hg"
# install_plugin Capistrano::SCM::Hg
# or
# require "capistrano/scm/svn"
# install_plugin Capistrano::SCM::Svn
# or
require 'capistrano/scm/git'
install_plugin Capistrano::SCM::Git

# Include tasks from other gems included in your Gemfile
#
# For documentation on these, see for example:
#
# https://github.com/capistrano/rvm
# https://github.com/capistrano/rbenv
# https://github.com/capistrano/chruby
# https://github.com/capistrano/bundler
# https://github.com/capistrano/rails
# https://github.com/capistrano/passenger
#
# require "capistrano/rvm"
require 'capistrano/rbenv'
# require "capistrano/chruby"
require 'capistrano/bundler'
require 'capistrano/rails/assets'
# require 'capistrano/rails/migrations'
# require 'capistrano/passenger'

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
58 changes: 35 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,50 +1,62 @@
# frozen_string_literal: true

source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.2.2'

gem 'blacklight'
gem 'blacklight', '~> 7.0'
gem 'bootsnap', require: false
gem 'bootstrap', '~> 4.0'
gem 'capistrano', '~> 3.17'
gem 'capistrano-passenger', '~> 0.2.1'
gem 'capistrano-rails', '~> 1.6'
gem 'capistrano-rbenv', '~> 2.2'
gem 'config'
gem 'devise'
gem 'geoblacklight', '~> 1.9.0'
gem 'geoblacklight', '~> 4.0'
gem 'importmap-rails'
gem 'jbuilder'
gem 'jquery-rails'
gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f'
gem 'mysql2'
gem 'omniauth'
gem 'omniauth', '1.9.2'
gem 'omniauth-oauth2'
gem 'rails'
gem 'rainbow'
gem 'rsolr'
gem 'sass-rails'
gem 'omniauth-rails_csrf_protection'
gem 'puma', '~> 5.0'
gem 'rails', '~> 7.0.6'
gem 'rsolr', '>= 1.0', '< 3'
gem 'sassc-rails', '~> 2.1'
gem 'sdoc', group: :doc
gem 'solr_wrapper'
gem 'sqlite3'
gem 'turbolinks'
gem 'twitter-typeahead-rails'
gem 'uglifier'
gem 'whenever'
gem 'sdr_cli', github: 'NYULibraries/sdr-cli'
gem 'sprockets', '< 4.0'
gem 'sprockets-rails'
gem 'stimulus-rails'
gem 'turbo-rails'
gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'view_component'
gem 'whenever', require: false

# Range limit gem for slider on Solr integer fields (year)
# Currently broken (9/2/2016)
# gem 'blacklight_range_limit'
group :test do
gem 'whenever-test'
end

group :development, :test do
gem 'axe-core-rspec'
gem 'bundler-audit'
gem 'byebug'
gem 'capybara'
gem 'capybara-screenshot'
gem 'database_cleaner'
gem 'dotenv-rails'
gem 'factory_bot_rails'
gem 'geckodriver-helper'
gem 'puma'
gem 'rspec-rails'
gem 'rubocop', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false
gem 'selenium-webdriver'
gem 'simplecov'
gem 'solr_wrapper'
gem 'spring'
gem 'sqlite3'
gem 'timecop'
gem 'web-console'
gem 'whenever-test'
end
Loading