diff --git a/Gemfile b/Gemfile index 166087295..0f8202b2c 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,6 @@ else end gem "card-mod-new_relic", path: "./vendor/card-mods" - gem "decko-cap", path: "./vendor/decko-cap" end gem "mysql2", "> 0.4" @@ -34,7 +33,7 @@ end gem 'net-smtp', require: false # VERSIONING ISSUES -gem "ffi", "1.16.3" # 1.17 requires rubygems version >= 3.3.22 +#gem "ffi", "1.16.3" # 1.17 requires rubygems version >= 3.3.22 # gem 'net-pop', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 65ab63fac..60932bafc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,19 +6,6 @@ PATH decko newrelic_rpm -PATH - remote: vendor/decko-cap - specs: - decko-cap (0.1) - airbrussh - bcrypt_pbkdf - capistrano - capistrano-bundler - capistrano-git-with-submodules (~> 2.0) - capistrano-maintenance - capistrano-passenger - ed25519 - PATH remote: vendor/decko/mod specs: @@ -295,13 +282,8 @@ GEM tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - airbrussh (1.5.3) - sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) base64 (0.2.0) - bcrypt_pbkdf (1.1.1) - bcrypt_pbkdf (1.1.1-arm64-darwin) - bcrypt_pbkdf (1.1.1-x86_64-darwin) benchmark (0.4.0) better_errors (2.10.1) erubi (>= 1.0.0) @@ -315,19 +297,6 @@ GEM rails (>= 3.1) break (0.40.0) builder (3.3.0) - capistrano (3.19.2) - airbrussh (>= 1.0.0) - i18n - rake (>= 10.0.0) - sshkit (>= 1.9.0) - capistrano-bundler (2.1.1) - capistrano (~> 3.1) - capistrano-git-with-submodules (2.0.6) - capistrano (~> 3.7) - capistrano-maintenance (1.2.1) - capistrano (>= 3.0) - capistrano-passenger (0.2.1) - capistrano (~> 3.0) carrierwave (3.0.7) activemodel (>= 6.0.0) activesupport (>= 6.0.0) @@ -360,12 +329,16 @@ GEM sinatra (>= 1.4.4) diff-lcs (1.5.1) drb (2.2.1) - ed25519 (1.3.0) erubi (1.13.0) erubis (2.7.0) excon (1.2.2) execjs (2.10.0) - ffi (1.16.3) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) fog-aws (3.29.0) base64 (~> 0.2.0) fog-core (~> 2.6) @@ -454,13 +427,8 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-scp (4.0.0) - net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (4.0.0) - net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol - net-ssh (7.3.0) newrelic_rpm (9.16.0) nio4r (2.7.4) nokogiri (1.16.8-aarch64-linux) @@ -475,7 +443,6 @@ GEM racc (~> 1.4) nokogiri (1.16.8-x86_64-linux) racc (~> 1.4) - ostruct (0.6.1) parallel (1.26.3) parser (3.3.6.0) ast (~> 2.4.1) @@ -594,12 +561,6 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - sshkit (1.23.2) - base64 - net-scp (>= 1.1.2) - net-sftp (>= 2.1.2) - net-ssh (>= 2.8.0) - ostruct ssrf_filter (1.2.0) stringio (3.1.2) temple (0.10.3) @@ -637,8 +598,6 @@ DEPENDENCIES card-mod-new_relic! dalli decko! - decko-cap! - ffi (= 1.16.3) fog-aws mysql2 (> 0.4) net-smtp diff --git a/config/sample/application.rb b/config/sample/application.rb new file mode 100644 index 000000000..736179a78 --- /dev/null +++ b/config/sample/application.rb @@ -0,0 +1,54 @@ +require File.expand_path('../boot', __FILE__) + +require 'decko/application' + +module DeckoOrg + class Application < Decko::Application + # Wagn inherits Rails configuration options. See http://guides.rubyonrails.org/configuring.html + + # Email configuration + + config.default_html_view = :content + config.encoding = "utf-8" + # config.cache_store = :dalli_store, [] + config.action_mailer.perform_deliveries = false + # config.email_defaults = { :from => 'noreply@decko.org' } + # config.action_mailer.smtp_settings = { :address => 'johannes.wikirate.org' } + # config.action_mailer.delivery_method = ... + # config.action_mailer.smtp_settings = ... + + # Example configuration for mailcatcher, a simple smtp server. + # See http://mailcatcher.me for more information + # config.action_mailer.delivery_method = :smtp + # config.action_mailer.smtp_settings = { address: "localhost", port: 1025 } + + # The below keys are fine for testing but should not be used in production sites. + + + # config.read_only = true + # defaults to false + # disallows creating, updating, and deleting cards. + + # config.cache_store = :file_store, 'tmp/cache' + # determines caching mechanism. options include: file_store, memory_store, mem_cache_store, dalli_store... + # + # for production, we highly recommend memcache + # here's a sample configuration for use with the dalli gem + # config.cache_store = :dalli_store, [] + + # config.paths['files'] = 'files' + # where uploaded files are actually stored. (eg Image and File cards) + + # config.paths['mod'] << 'my-mod-dir' + # add a new directory for code customizations, or "mods" + + # config.allow_inline_styles = false + # don't strip style attributes (not recommended) + + # config.override_host = nil + # don't autodetect host (example.com) from web requests + + # config.override_protocol = nil + # don't autodetect protocol (http/https) from web requests + end +end diff --git a/vendor/card-mods b/vendor/card-mods index 5ccbec60f..5e143d750 160000 --- a/vendor/card-mods +++ b/vendor/card-mods @@ -1 +1 @@ -Subproject commit 5ccbec60f5e8912e7cf582b5ef2e80920dbf0a71 +Subproject commit 5e143d7501e9efa05f6c83a904132e7690af717f diff --git a/vendor/decko b/vendor/decko index 45701f9d6..564c2690e 160000 --- a/vendor/decko +++ b/vendor/decko @@ -1 +1 @@ -Subproject commit 45701f9d6922c9663976078ba17756cfc31c1df6 +Subproject commit 564c2690ee285d0db5c8acdc4d2d844ef2406bc1