From 6ad3e0ec18c16248aad6922a8f9fb594f8eda76c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 20 Sep 2023 22:18:33 -0400 Subject: [PATCH] 20300: Add sprockets-rails. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/api/Gemfile | 1 + services/api/Gemfile.lock | 8 ++++++++ services/api/app/assets/config/manifest.js | 7 +++++++ services/api/config/application.rb | 1 + 4 files changed, 17 insertions(+) create mode 100644 services/api/app/assets/config/manifest.js diff --git a/services/api/Gemfile b/services/api/Gemfile index a7ceeb4a18..dafb0d3801 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -7,6 +7,7 @@ source 'https://rubygems.org' gem 'rails', '~> 7.0.0' gem 'responders' gem 'i18n' +gem 'sprockets-rails' group :test, :development do gem 'factory_bot_rails' diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 9e09fb64af..d18fc8b07a 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -257,6 +257,13 @@ GEM simplecov-html (0.7.1) simplecov-rcov (0.3.1) simplecov (>= 0.4.1) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) test-unit (3.6.1) power_assert thor (1.2.2) @@ -300,6 +307,7 @@ DEPENDENCIES ruby-prof (~> 0.15.0) simplecov (~> 0.7.1) simplecov-rcov + sprockets-rails test-unit (~> 3.0) themes_for_rails! diff --git a/services/api/app/assets/config/manifest.js b/services/api/app/assets/config/manifest.js new file mode 100644 index 0000000000..ceb233892c --- /dev/null +++ b/services/api/app/assets/config/manifest.js @@ -0,0 +1,7 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/services/api/config/application.rb b/services/api/config/application.rb index be91e8673c..ca5eff1a47 100644 --- a/services/api/config/application.rb +++ b/services/api/config/application.rb @@ -16,6 +16,7 @@ require "action_mailer/railtie" # require "action_text/engine" require "action_view/railtie" # require "action_cable/engine" +require "sprockets/railtie" require "rails/test_unit/railtie" # Require the gems listed in Gemfile, including any gems -- 2.30.2