Skip to content

Commit

Permalink
Merge pull request #1068 from notch8/update-github-org
Browse files Browse the repository at this point in the history
Update GitHub Org (SoftServ => Notch8)
  • Loading branch information
bkiahstroud authored Jan 13, 2025
2 parents 02d448e + c14df69 commit 0d573ab
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
with:
platforms: "linux/amd64"
Expand All @@ -26,10 +26,10 @@ jobs:
workerTarget: hyku-worker
test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
rubocop_cmd: 'bundle exec rubocop --parallel --format progress'

2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ on:

jobs:
deploy:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN wget -O - https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemal
make && \
make install

FROM ghcr.io/scientist-softserv/dev-ops/samvera:f71b284f as hyku-base
FROM ghcr.io/notch8/dev-ops/samvera:f71b284f as hyku-base

COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
RUN sh -l -c " \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'main'
gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'main'
gem 'i18n-debug', require: false, group: %i[development test]
gem 'i18n-tasks', group: %i[development test]
gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
gem 'iiif_print', github: 'notch8/iiif_print', branch: 'main'
gem 'jbuilder', '~> 2.5'
gem 'jquery-rails' # Use jquery as the JavaScript library
# The maintainers yanked 0.3.2 version (see https://github.com/dryruby/json-canonicalization/issues/2)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ GIT
valkyrie (~> 2, >= 2.1.1)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
remote: https://github.com/notch8/iiif_print.git
revision: eb320b1c454f0219d9e17fd12fd2b525770123b2
branch: main
specs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ Analytics is comprised of two aspects:
- *Sending* data to the analytics end-point
- *Fetching* and reporting data from the analytics end-point

For a more exhaustive discusion, see [Resolve Sending Google Analytics Data for Tenant and Proprietor · Issue #910 · scientist-softserv/palni-palci](https://github.com/scientist-softserv/palni-palci/issues/910).
For a more exhaustive discusion, see [Resolve Sending Google Analytics Data for Tenant and Proprietor · Issue #910 · notch8/palni-palci](https://github.com/notch8/palni-palci/issues/910).

### Google

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users/omniauth_callbacks_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def callback
@user = User.from_omniauth(request.env['omniauth.auth'])

if @user.persisted?
# https://github.com/scientist-softserv/palni-palci/issues/633
# https://github.com/notch8/palni-palci/issues/633
WorkAuthorization.handle_signin_for!(user: @user, scope: params[:scope])

# By default the sign_in_and_redirect method will look for a stored_location_for. However,
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/create_large_derivatives_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# @see CreateDerivativesJobDecorator
# @see Hydra::Derivatives::Processors::Ffmpeg
# @see https://github.com/scientist-softserv/palni-palci/issues/852
# @see https://github.com/notch8/palni-palci/issues/852
class CreateLargeDerivativesJob < CreateDerivativesJob
queue_as :auxiliary
end
2 changes: 1 addition & 1 deletion app/models/sushi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ def coerce_author(params = {})
return true unless params.key?(:author)
@author = params[:author]

# See https://github.com/scientist-softserv/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
# See https://github.com/notch8/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
raise Sushi::Error::InvalidReportFilterValueError.new(data: "You may not query for multiple authors (as specified by the `#{DELIMITER}' delimiter.)") if @author.include?(DELIMITER)

# rubocop:disable Metrics/LineLength
Expand Down
2 changes: 1 addition & 1 deletion app/models/sushi/platform_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def attribute_performance_for_resource_types
# We want to consider "or" behavior for multiple metric_types. Namely if you specify any
# metric type (other than Searches_Platform) you're going to get results.
#
# See https://github.com/scientist-softserv/palni-palci/issues/686#issuecomment-1785326034
# See https://github.com/notch8/palni-palci/issues/686#issuecomment-1785326034
return [] if metric_type_in_params && (metric_types & (ALLOWED_METRIC_TYPES - ['Searches_Platform'])).count.zero?

data_for_resource_types.map do |record|
Expand Down
2 changes: 1 addition & 1 deletion app/models/work_authorization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# first does all of the postgres and then does one (ideally single) fedora change. It is
# not bullet proof but does hopefully improve the chances of data integrity.
#
# @see https://github.com/scientist-softserv/palni-palci/issues/633
# @see https://github.com/notch8/palni-palci/issues/633
class WorkAuthorization < ActiveRecord::Base # rubocop:disable ApplicationRecord
class WorkNotFoundError < StandardError
def initialize(user:, work:)
Expand Down
2 changes: 1 addition & 1 deletion app/presenters/hyrax/collection_presenter_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def collection_featurable?
#
# @return [String]
#
# @see https://github.com/scientist-softserv/palni-palci/issues/951
# @see https://github.com/notch8/palni-palci/issues/951
# @see https://github.com/samvera/hyku/issues/1815
def collection_type_badge
return "" unless Site.account&.present?
Expand Down
16 changes: 8 additions & 8 deletions app/services/iiif_print/tenant_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ module IiifPrint
# it is hopefully easier to understand the configuration requirements and scope to this
# change. At some point, this might make sense to bring into IIIF Print directly.
#
# @see https://github.com/scientist-softserv/palni-palci/issues/656 palni-palci#656
# @see https://github.com/scientist-softserv/palni-palci/issues/657 palni-palci#657
# @see https://github.com/scientist-softserv/palni-palci/issues/658 palni-palci#658
# @see https://github.com/scientist-softserv/palni-palci/issues/659 palni-palci#659
# @see https://github.com/notch8/palni-palci/issues/656 palni-palci#656
# @see https://github.com/notch8/palni-palci/issues/657 palni-palci#657
# @see https://github.com/notch8/palni-palci/issues/658 palni-palci#658
# @see https://github.com/notch8/palni-palci/issues/659 palni-palci#659
module TenantConfig
##
# When we were not planning on calling the underlying IiifPrint service but did due to some kind
Expand Down Expand Up @@ -92,8 +92,8 @@ def iiif_print_service_instance
# derivative_service_plugins: [ IiifPrint::TextExtractionDerivativeService ])
# end
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/scientist-softserv/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/notch8/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
module PdfSplitter
mattr_accessor :iiif_print_splitter
self.iiif_print_splitter = ::IiifPrint::SplitPdfs::PagesToJpgsSplitter
Expand All @@ -108,7 +108,7 @@ def self.call(*args)
end

##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
module SkipSplittingPdfService
##
# @return [Symbol] Always :tenant_does_not_split_pdfs
Expand All @@ -127,7 +127,7 @@ def self.conditionally_enqueue(*_args)
# a relatively singular place for all of the configurations.
module FileSetActorDecorator
##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
def service
return TenantConfig::SkipSplittingPdfService unless TenantConfig.use_iiif_print?

Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Application < Rails::Application
# @return [String] the URL to use for searching across all tenants.
#
# @see .cross_tenant_search_host
# @see https://github.com/scientist-softserv/palni-palci/issues/947
# @see https://github.com/notch8/palni-palci/issues/947
def self.cross_tenant_search_url
# Do not include the scheme (e.g. http or https) but instead let the browser apply the correct
# scheme.
Expand Down Expand Up @@ -123,7 +123,7 @@ def self.cross_tenant_search_host
##
# This needs to be in the after initialize so that the IiifPrint gem can do it's decoration.
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
Hyrax::Actors::FileSetActor.prepend(IiifPrint::TenantConfig::FileSetActorDecorator)

Hyrax::WorkShowPresenter.prepend(IiifPrint::TenantConfig::WorkShowPresenterDecorator)
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x-app: &app
args:
- EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
- HYKU_BULKRAX_ENABLED=true
image: ghcr.io/scientist-softserv/palni-palci:${TAG:-latest}
image: ghcr.io/notch8/palni-palci:${TAG:-latest}
env_file:
- .env
# NOTE: all common env variables moved to .env
Expand All @@ -29,9 +29,9 @@ x-app-worker: &app-worker
- EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
- HYKU_BULKRAX_ENABLED=true
cache_from:
- ghcr.io/scientist-softserv/palni-palci:latest
- ghcr.io/scientist-softserv/palni-palci/worker:latest
image: ghcr.io/scientist-softserv/palni-palci/worker:${TAG:-latest}
- ghcr.io/notch8/palni-palci:latest
- ghcr.io/notch8/palni-palci/worker:latest
image: ghcr.io/notch8/palni-palci/worker:${TAG:-latest}
command: sh -l -c 'bundle && bundle exec sidekiq'
depends_on:
check_volumes:
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
timeout: "8s"

solr:
image: ghcr.io/scientist-softserv/palni-palci/solr:${TAG:-latest}
image: ghcr.io/notch8/palni-palci/solr:${TAG:-latest}
build:
context: solr
dockerfile: Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion lib/hyrax/controlled_vocabularies/location_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module LocationDecorator
# the Location class throws an error that split is undefined since it is an enumerator, but this error is coming from deeply nested dependencies.
# This causes 500 errors for works with their Location field filled in.
# defining split just for the purpose of getting past this error seemed to work and allow locations to save correctly with no adverse effects.
# See https://github.com/scientist-softserv/palni-palci/issues/530 for more details
# See https://github.com/notch8/palni-palci/issues/530 for more details
def split(*)
[]
end
Expand Down
2 changes: 1 addition & 1 deletion lib/omni_auth/strategies/open_id_connect_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module Strategies
##
# OVERRIDE to provide openid {#scope} based on the current session.
#
# @see https://github.com/scientist-softserv/palni-palci/issues/633
# @see https://github.com/notch8/palni-palci/issues/633
module OpenIDConnectDecorator
##
# override callback phase to fix issue where state is not required.
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/move_banner_images.rake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

# @see https://github.com/scientist-softserv/palni-palci/issues/674
# @see https://github.com/notch8/palni-palci/issues/674
namespace :hyku do
desc 'Move all banner images to new expected location'
task copy_banner_images: :environment do
Expand Down
8 changes: 4 additions & 4 deletions spec/features/feature_flag_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# rubocop:enable RSpec/LetSetup

context 'as a repository admin' do
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has a setting for featured works' do
login_as admin
visit 'admin/features'
Expand All @@ -44,7 +44,7 @@
expect(page).to have_content 'Pandas'
end

skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has a setting for recently uploaded' do
login_as admin
visit 'admin/features'
Expand All @@ -63,7 +63,7 @@
expect(page).to have_css('div#recently_uploaded')
end

skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has settings for the default PDF viewer with a custom toggle switch' do
login_as admin
visit 'admin/features'
Expand All @@ -76,7 +76,7 @@
end

context 'when all home tabs and share work features are turned off' do
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'the page only shows the collections tab' do
login_as admin
visit 'admin/features'
Expand Down

0 comments on commit 0d573ab

Please sign in to comment.