Skip to content

Commit

Permalink
Merge pull request #179 from notch8/rename-repo-references-to-notch8
Browse files Browse the repository at this point in the history
🧹 renames scientst-softserv => notch8
  • Loading branch information
Shana Moore authored Jan 11, 2025
2 parents 6dd1ccb + 82d6017 commit 99feb64
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-solr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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 Down
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,14 +26,14 @@ jobs:

test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
confdir: '/app/samvera/hyrax-webapp/solr/conf'
rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"

lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: hyku-web
workerTarget: hyku-worker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,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 app/controllers/users/omniauth_callbacks_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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/helpers/hyku_knapsack/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def media_display_partial(file_set)
# @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
2 changes: 1 addition & 1 deletion app/models/work_authorization.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# outside the model. In the case of PALNI/PALCI there will be a Shibboleth/SAML authentication that
# indicates we should create a WorkAuthorization entry for a group of works.
#
# @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 config/initializers/hyrax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# # Injected via `rails g hyrax:work Cdl`
config.register_curation_concern :cdl

# # See https://github.com/scientist-softserv/adventist-dl/issues/183
# # See https://github.com/notch8/adventist-dl/issues/183
# # Also, we will continue to extract txt file's text using Adventist::TextFileTextExtractionService
# config.extract_full_text = false
# config.work_requires_files = false
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ x-app: &app
args:
BUILDKIT_INLINE_CACHE: 1
APP_PATH: ./hyrax-webapp
image: ghcr.io/scientist-softserv/palni_palci_knapsack:${TAG:-latest}
image: ghcr.io/notch8/palni_palci_knapsack:${TAG:-latest}
environment:
# This line is what makes the knapsack include use the local code instead of the remote gem
- BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
Expand Down Expand Up @@ -62,7 +62,7 @@ services:
extends:
file: hyrax-webapp/docker-compose.yml
service: base
image: ghcr.io/scientist-softserv/palni_palci_knapsack/base:${TAG:-latest}
image: ghcr.io/notch8/palni_palci_knapsack/base:${TAG:-latest}
command: bash -l -c "echo 'base is only used for building base images, which in turn reduces image build times. It does not need to be run'"

web:
Expand Down Expand Up @@ -96,7 +96,7 @@ services:
args:
BUILDKIT_INLINE_CACHE: 1
APP_PATH: ./hyrax-webapp
image: ghcr.io/scientist-softserv/palni_palci_knapsack/worker:${TAG:-latest}
image: ghcr.io/notch8/palni_palci_knapsack/worker:${TAG:-latest}
# Uncomment command to access container with out starting bin/worker. Useful for debugging or updating Gemfile.lock
# command: sleep infinity
volumes:
Expand Down
2 changes: 1 addition & 1 deletion hyrax-webapp
Submodule hyrax-webapp updated 70 files
+2 −2 .github/workflows/base.yaml
+4 −4 .github/workflows/build-test-lint.yaml
+1 −1 .github/workflows/deploy.yaml
+4 −4 Gemfile
+41 −41 Gemfile.lock
+0 −20 app/assets/javascripts/admin_color_select.js
+0 −6 app/assets/javascripts/admin_font_select.js
+1 −3 app/assets/javascripts/application.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/colors.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/default_images.js
+1 −1 app/assets/javascripts/hyku/admin/appearance/fonts.js
+1 −1 app/assets/stylesheets/application.css
+114 −26 app/assets/stylesheets/hyku.scss
+1 −78 app/assets/stylesheets/hyrax.scss
+6 −5 app/assets/stylesheets/themes/cultural_repository.scss
+1 −1 app/assets/stylesheets/themes/scholarly_show.scss
+0 −2 app/assets/stylesheets/variables.scss
+1 −0 app/controllers/application_controller.rb
+27 −0 app/controllers/devise_guest_controllers_helpers_decorator.rb
+1 −1 app/controllers/hyrax/contact_form_controller_decorator.rb
+1 −1 app/controllers/hyrax/pages_controller_decorator.rb
+16 −3 app/forms/hyku/forms/admin/appearance.rb
+1 −1 app/jobs/create_large_derivatives_job.rb
+1 −1 app/models/sushi.rb
+1 −1 app/models/sushi/platform_report.rb
+1 −1 app/presenters/hyrax/collection_presenter_decorator.rb
+1 −1 app/services/hyrax/work_uploads_handler_decorator.rb
+8 −8 app/services/iiif_print/tenant_config.rb
+2 −2 app/views/admin/roles_service/index.html.erb
+1 −1 app/views/hyrax/admin/appearances/_banner_image_form.html.erb
+1 −1 app/views/hyrax/base/_analytics_button.html.erb
+6 −5 app/views/hyrax/base/show.html.erb
+0 −5 app/views/hyrax/collections/_collection_description.html.erb
+72 −68 app/views/hyrax/collections/show.html.erb
+8 −8 app/views/hyrax/content_blocks/_form.html.erb
+2 −2 app/views/hyrax/homepage/_featured_collection_section.html.erb
+1 −1 app/views/hyrax/homepage/_recent_document.html.erb
+1 −1 app/views/hyrax/my/_collection_action_menu.html.erb
+1 −1 app/views/hyrax/my/_work_action_menu.html.erb
+1 −1 app/views/hyrax/oers/_form_metadata.html.erb
+3 −3 app/views/hyrax/oers/show.html.erb
+100 −0 app/views/hyrax/pages/_form.html.erb
+2 −2 app/views/roles/index.html.erb
+156 −92 app/views/shared/_appearance_styles.html.erb
+1 −1 app/views/shared/_footer.html.erb
+1 −1 app/views/themes/cultural_repository/_facets.html.erb
+1 −1 app/views/themes/cultural_repository/catalog/_search_form.html.erb
+1 −1 app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb
+3 −3 app/views/themes/image_show/hyrax/base/show.html.erb
+1 −1 app/views/themes/institutional_repository/catalog/_search_form.html.erb
+1 −0 app/views/themes/institutional_repository/layouts/hyrax.html.erb
+4 −4 app/views/themes/neutral_repository/layouts/_share_your_work_row.html.erb
+3 −3 app/views/themes/scholarly_show/hyrax/oers/show.html.erb
+2 −2 config/application.rb
+1 −1 config/initializers/simple_form_bootstrap.rb
+5 −0 config/locales/en.yml
+3 −0 config/locales/hyrax.en.yml
+5 −15 db/schema.rb
+2 −1 docker-compose.yml
+7 −3 lib/reprocessor.rb
+1 −1 spec/controllers/hyrax/homepage_controller_spec.rb
+4 −1 spec/features/appearance_theme_spec.rb
+4 −1 spec/features/create_etd_spec.rb
+4 −1 spec/features/create_generic_work_spec.rb
+4 −1 spec/features/create_image_spec.rb
+4 −1 spec/features/create_oer_spec.rb
+4 −4 spec/features/feature_flag_spec.rb
+4 −1 spec/features/work_editor_role_spec.rb
+6 −0 spec/lib/bulkrax/bulkrax_decorator_spec.rb
+9 −9 yarn.lock
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 @@ -4,7 +4,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
# rubocop:disable Metrics/BlockLength
namespace :hyku do
desc 'Move all banner images to new expected location'
Expand Down

0 comments on commit 99feb64

Please sign in to comment.