diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index acdd59b9..8b35ed2b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -67,9 +67,9 @@ blocks: commands: - bin/rspec --tag type:feature - - name: Jasmine - commands: - - bundle exec rails jasmine:ci + # - name: Jasmine + # commands: + # - bundle exec rails jasmine:ci promotions: - name: Deploy to Heroku diff --git a/CHANGELOG.md b/CHANGELOG.md index 84d805dd..414bc8a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log ## Unreleased +- Updated Rails version to 5.2.4.3 +- Updated most important gems (pundit, draper etc) to fresh versions - Updated rack-mini-profiler to version 1.1.3 - Ruby updated to version 2.5.7 - Replace gem [metamagic](https://github.com/lassebunk/metamagic) to [meta-tags](https://github.com/kpumuk/meta-tags). Using for CEO. diff --git a/Gemfile b/Gemfile index d4147171..9213990d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" ruby "2.5.7" gem "pg" -gem "rails", "5.1.6.2" +gem "rails", "5.2.4.3" # assets gem "autoprefixer-rails" @@ -27,6 +27,7 @@ gem "simple_form" gem "slim" # all other gems +gem "bootsnap" gem "decent_decoration" gem "decent_exposure" gem "devise" diff --git a/Gemfile.lock b/Gemfile.lock index e4f376d5..81ee05b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,25 +9,25 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.1.6.2) - actionpack (= 5.1.6.2) + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) + websocket-driver (>= 0.6.1) + actionmailer (5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.2) - actionview (= 5.1.6.2) - activesupport (= 5.1.6.2) - rack (~> 2.0) + actionpack (5.2.4.3) + actionview (= 5.2.4.3) + activesupport (= 5.2.4.3) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6.2) - activesupport (= 5.1.6.2) + actionview (5.2.4.3) + activesupport (= 5.2.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -35,28 +35,31 @@ GEM active_link_to (1.0.5) actionpack addressable - activejob (5.1.6.2) - activesupport (= 5.1.6.2) + activejob (5.2.4.3) + activesupport (= 5.2.4.3) globalid (>= 0.3.6) - activemodel (5.1.6.2) - activesupport (= 5.1.6.2) - activemodel-serializers-xml (1.0.1) + activemodel (5.2.4.3) + activesupport (= 5.2.4.3) + activemodel-serializers-xml (1.0.2) activemodel (> 5.x) - activerecord (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.1.6.2) - activemodel (= 5.1.6.2) - activesupport (= 5.1.6.2) - arel (~> 8.0) - activesupport (5.1.6.2) + activerecord (5.2.4.3) + activemodel (= 5.2.4.3) + activesupport (= 5.2.4.3) + arel (>= 9.0) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) + marcel (~> 0.3.1) + activesupport (5.2.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - arel (8.0.0) + arel (9.0.0) ast (2.4.0) autoprefixer-rails (6.7.4) execjs @@ -67,13 +70,15 @@ GEM execjs (~> 2.0) bcrypt (3.1.13) bindex (0.8.1) + bootsnap (1.4.6) + msgpack (~> 1.0) brakeman (3.7.0) - builder (3.2.3) - bullet (5.6.1) + builder (3.2.4) + bullet (6.1.0) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) + uniform_notifier (~> 1.11) + bundler-audit (0.6.1) + bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (9.0.6) capybara (2.12.1) @@ -88,9 +93,9 @@ GEM codeclimate-test-reporter (0.6.0) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.1) - coffee-rails (4.2.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs @@ -99,10 +104,10 @@ GEM coffee-script execjs json - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) + crass (1.0.6) css_parser (1.4.9) addressable database_cleaner (1.6.1) @@ -118,26 +123,26 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) docile (1.1.5) - dotenv (2.2.1) - dotenv-rails (2.2.1) - dotenv (= 2.2.1) - railties (>= 3.2, < 5.2) - draper (3.0.0) - actionpack (~> 5.0) - activemodel (~> 5.0) - activemodel-serializers-xml (~> 1.0) - activesupport (~> 5.0) - request_store (~> 1.0) + dotenv (2.7.5) + dotenv-rails (2.7.5) + dotenv (= 2.7.5) + railties (>= 3.2, < 6.1) + draper (4.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + activemodel-serializers-xml (>= 1.0) + activesupport (>= 5.0) + request_store (>= 1.0) email_spec (2.1.0) htmlentities (~> 4.3.3) launchy (~> 2.1) mail (~> 2.6.3) erubi (1.9.0) execjs (2.7.0) - factory_bot (5.1.1) + factory_bot (5.2.0) activesupport (>= 4.2.0) - factory_bot_rails (5.1.1) - factory_bot (~> 5.1.0) + factory_bot_rails (5.2.0) + factory_bot (~> 5.2.0) railties (>= 4.2.0) faker (1.7.3) i18n (~> 0.5) @@ -183,12 +188,12 @@ GEM foundation_emails (~> 2) nokogiri interactor (3.1.0) - jasmine (2.5.2) - jasmine-core (>= 2.5.1, < 3.0.0) + jasmine (3.5.1) + jasmine-core (~> 3.5.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.5.2) + jasmine-core (3.5.0) jasmine-jquery-rails (2.0.3) json (2.0.3) kaminari (1.0.1) @@ -211,26 +216,30 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.11) mail (2.6.6) mime-types (>= 1.16, < 4) + marcel (0.3.3) + mimemagic (~> 0.3.2) memory_profiler (0.9.7) - meta-tags (2.4.1) - actionpack (>= 3.2.0, < 5.2) + meta-tags (2.13.0) + actionpack (>= 3.2.0, < 6.1) method_source (0.8.2) - mime-types (3.3) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0904) + mime-types-data (3.2020.0512) + mimemagic (0.3.5) mini_portile2 (2.4.0) - minitest (5.12.2) + minitest (5.14.1) + msgpack (1.3.3) multi_json (1.12.1) nenv (0.3.0) newrelic_rpm (3.18.1.330) - nio4r (2.3.1) - nokogiri (1.10.7) + nio4r (2.5.2) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) notiffany (0.1.1) nenv (~> 0.1) @@ -260,23 +269,24 @@ GEM puma (3.12.2) pundit (1.1.0) activesupport (>= 3.0.0) - rack (2.0.8) + rack (2.2.2) rack-canonical-host (0.2.2) addressable (> 0, < 3) rack (>= 1.0.0, < 3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.2) - actioncable (= 5.1.6.2) - actionmailer (= 5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) - activemodel (= 5.1.6.2) - activerecord (= 5.1.6.2) - activesupport (= 5.1.6.2) + rails (5.2.4.3) + actioncable (= 5.2.4.3) + actionmailer (= 5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + activemodel (= 5.2.4.3) + activerecord (= 5.2.4.3) + activestorage (= 5.2.4.3) + activesupport (= 5.2.4.3) bundler (>= 1.3.0) - railties (= 5.1.6.2) + railties (= 5.2.4.3) sprockets-rails (>= 2.0.0) rails-assets-jquery (3.1.1) rails-assets-jquery-ujs (1.2.2) @@ -292,19 +302,20 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.1.6.2) - actionpack (= 5.1.6.2) - activesupport (= 5.1.6.2) + railties (5.2.4.3) + actionpack (= 5.2.4.3) + activesupport (= 5.2.4.3) method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rainbow (2.2.2) rake rake (12.3.3) rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - request_store (1.3.2) + request_store (1.5.0) + rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) @@ -373,10 +384,10 @@ GEM slim (3.0.9) temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) - slim-rails (3.1.1) + slim-rails (3.2.0) actionpack (>= 3.1) railties (>= 3.1) - slim (~> 3.0) + slim (>= 3.0, < 5.0) slim_lint (0.11.0) rake (>= 10, < 13) rubocop (>= 0.47.0) @@ -408,12 +419,12 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (3.0.4) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) - uniform_notifier (1.10.0) + uniform_notifier (1.13.0) warden (1.2.8) rack (>= 2.0.6) web-console (3.7.0) @@ -425,9 +436,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.6.5) + websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (2.1.0) nokogiri (~> 1.3) @@ -438,6 +449,7 @@ DEPENDENCIES active_link_to autoprefixer-rails awesome_print + bootsnap brakeman bullet bundler-audit @@ -479,7 +491,7 @@ DEPENDENCIES pundit rack-canonical-host rack-mini-profiler! - rails (= 5.1.6.2) + rails (= 5.2.4.3) rails-assets-jquery-ujs! rails-assets-jquery2! rails-erd @@ -510,4 +522,4 @@ RUBY VERSION ruby 2.5.7p206 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/bin/bundle b/bin/bundle index 66e9889e..67efc37f 100755 --- a/bin/bundle +++ b/bin/bundle @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -load Gem.bin_path('bundler', 'bundle') +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) +load Gem.bin_path("bundler", "bundle") diff --git a/bin/guard b/bin/guard old mode 100644 new mode 100755 diff --git a/bin/rspec b/bin/rspec index 8685d310..137dbae3 100755 --- a/bin/rspec +++ b/bin/rspec @@ -4,19 +4,20 @@ begin rescue LoadError => e raise unless e.message.include?("spring") end + # frozen_string_literal: true # # This file was generated by Bundler. # -# The application 'rspec' is installed as part of a gem, and +# The application "rspec" is installed as part of a gem, and # this file is here to facilitate running it. # -require 'pathname' -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", Pathname.new(__FILE__).realpath) -require 'rubygems' -require 'bundler/setup' +require "rubygems" +require "bundler/setup" -load Gem.bin_path('rspec-core', 'rspec') +load Gem.bin_path("rspec-core", "rspec") diff --git a/bin/setup b/bin/setup index a9cf7fb5..2a9e5f00 100755 --- a/bin/setup +++ b/bin/setup @@ -8,7 +8,7 @@ if [ "$CI" ]; then fi # Make sure we have Bundler installed -gem install bundler -v 1.17.3 --conservative +gem install bundler --conservative # Set up Ruby dependencies via Bundler into .bundle folder rm -f .bundle/config @@ -16,6 +16,9 @@ rm -f .bundle/config bundle check --path .bundle > /dev/null 2>&1 || bundle install --path=.bundle $BUNDLER_ARGS +# Set up node.js modules +bin/yarn install + # Set up configurable environment variables if [ ! -f .env ]; then cp .env.example .env diff --git a/bin/spring b/bin/spring index d39b2ff2..b44ad1a7 100755 --- a/bin/spring +++ b/bin/spring @@ -8,7 +8,8 @@ unless defined?(Spring) require "bundler" lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) - if spring = lockfile.specs.detect { |spec| spec.name == "spring" } + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path gem "spring", spring.version require "spring/binstub" diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 00000000..460dd565 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config/boot.rb b/config/boot.rb index 28201161..988a5ddc 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,3 +1,4 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) require "bundler/setup" # Set up gems listed in the Gemfile. +require "bootsnap/setup" # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml index 0bbde6f7..57a63049 100644 --- a/config/cable.yml +++ b/config/cable.yml @@ -6,4 +6,5 @@ test: production: adapter: redis - url: redis://localhost:6379/1 + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: rails_base_production diff --git a/config/environments/development.rb b/config/environments/development.rb index b2f4143e..b8c4f67c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -13,12 +13,13 @@ config.consider_all_requests_local = true # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. if Rails.root.join("tmp", "caching-dev.txt").exist? config.action_controller.perform_caching = true config.cache_store = :memory_store config.public_file_server.headers = { - "Cache-Control" => "public, max-age=172800" + "Cache-Control" => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false @@ -26,12 +27,12 @@ config.cache_store = :null_store end + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false - # Preview email in the browser instead of sending it. - config.action_mailer.delivery_method = :letter_opener - config.action_mailer.perform_caching = false # Print deprecation notices to the Rails logger. @@ -40,6 +41,9 @@ # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large # number of complex assets. @@ -53,5 +57,8 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. - # config.file_watcher = ActiveSupport::EventedFileUpdateChecker + config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + # Preview email in the browser instead of sending it. + config.action_mailer.delivery_method = :letter_opener end diff --git a/config/environments/test.rb b/config/environments/test.rb index 4749a7d4..654154be 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -15,7 +15,7 @@ # Configure public file server for tests with Cache-Control for performance. config.public_file_server.enabled = true config.public_file_server.headers = { - "Cache-Control" => "public, max-age=3600" + "Cache-Control" => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. @@ -27,6 +27,10 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 286fb5ed..c2ca576f 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -2,8 +2,18 @@ # Version of your assets, change this if you want to expire all your assets. Rails.application.config.assets.version = ENV.fetch("ASSETS_VERSION", "1.0") -Rails.application.config.assets.precompile += %w[mailer] + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join("node_modules") # Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += ["**/*.woff", "**/*.woff2"] +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) +Rails.application.config.assets.precompile += %w[mailer jasmine-jquery.js] + +# Unknown asset fallback will return the path passed in when the given +# asset is not present in the asset pipeline. +# Rails.application.config.assets.unknown_asset_fallback = false diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 00000000..d3bcaa5e --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/generators.rb b/config/initializers/generators.rb index b875d847..3aff41c8 100644 --- a/config/initializers/generators.rb +++ b/config/initializers/generators.rb @@ -11,3 +11,9 @@ view_specs: false ) end + +# Make `form_with` generate non-remote forms. +Rails.application.config.action_view.form_with_generates_remote_forms = false + +# Make `form_with` generate id attributes for any generated HTML tags. +Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb deleted file mode 100644 index 9010abd5..00000000 --- a/config/initializers/new_framework_defaults_5_1.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 5.1 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Make `form_with` generate non-remote forms. -Rails.application.config.action_view.form_with_generates_remote_forms = false - -# Unknown asset fallback will return the path passed in when the given -# asset is not present in the asset pipeline. -# Rails.application.config.assets.unknown_asset_fallback = false diff --git a/config/puma.rb b/config/puma.rb index c3ac7355..4cc7c7fe 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,5 +1,6 @@ workers ENV.fetch("WEB_CONCURRENCY", 2).to_i threads_count = ENV.fetch("MAX_THREADS", 5).to_i + threads threads_count, threads_count rackup DefaultRackup diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 00000000..d32f76e8 --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 836e0547..67cd2bc3 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -11,8 +11,8 @@ # - dist/**/*.js # src_files: - - assets/application.js - - assets/jasmine-jquery.js + # - application.js + # - assets/jasmine-jquery.js # stylesheets # @@ -26,7 +26,7 @@ src_files: # - stylesheets/*.css # stylesheets: - - assets/application.css + #- assets/application.css # helpers #