Skip to content

Commit

Permalink
try another build
Browse files Browse the repository at this point in the history
  • Loading branch information
ethn committed Dec 3, 2024
1 parent bc4a215 commit b6fa56c
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 51 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
53 changes: 6 additions & 47 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -637,8 +598,6 @@ DEPENDENCIES
card-mod-new_relic!
dalli
decko!
decko-cap!
ffi (= 1.16.3)
fog-aws
mysql2 (> 0.4)
net-smtp
Expand Down
54 changes: 54 additions & 0 deletions config/sample/application.rb
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion vendor/card-mods
Submodule card-mods updated 55 files
+1 −1 .semaphore/decko
+2 −2 .semaphore/semaphore.yml
+2 −2 card-mod-bookmarks/lib/card/bookmark.rb
+8 −1 card-mod-counts/README.md
+8 −0 card-mod-counts/data/schema/20240909164452_add_count_flags.rb
+40 −0 card-mod-counts/lib/card/count.rb
+53 −0 card-mod-counts/lib/card/count/bulk_methods.rb
+98 −0 card-mod-counts/lib/card/count/class_methods.rb
+1 −0 card-mod-counts/lib/card/mod/counts.rb
+1 −1 card-mod-counts/lib/card/query/cached_count_join.rb
+0 −88 card-mod-counts/lib/count.rb
+8 −0 card-mod-counts/lib/tasks/card/count.rake
+17 −10 card-mod-counts/set/abstract/01_cached_count.rb
+1 −1 card-mod-counts/set/abstract/list_ref_cached_count.rb
+1 −1 card-mod-counts/spec/card/query/cached_count_sorting_spec.rb
+17 −8 card-mod-counts/spec/count_spec.rb
+1 −1 card-mod-csv_import/assets/script/import_map.js.coffee
+1 −1 card-mod-csv_import/data/files/mod_csv_import_script_asset_output/file.js
+1 −1 card-mod-csv_import/set/right/import_map/map_table.haml
+1 −1 card-mod-csv_import/set/right/import_status/status_table.rb
+2 −2 card-mod-csv_import/spec/set/right/import_status_spec.rb
+1 −1 card-mod-csv_import/spec/support/cardio/import_item_spec_helper.rb
+12 −8 card-mod-export/set/abstract/export.rb
+63 −22 card-mod-filter/assets/script/filter_form.js.coffee
+14 −1 card-mod-filter/assets/style/filter.scss
+1 −1 card-mod-filter/data/files/mod_filter_script_asset_output/file.js
+2 −13 card-mod-filter/set/abstract/0_filter.rb
+1 −1 card-mod-filter/set/abstract/0_filter/filter_fields.rb
+27 −4 card-mod-filter/set/abstract/0_filter/filter_form.rb
+13 −0 card-mod-filter/set/abstract/0_filter/filter_form/filter_closers.haml
+10 −28 card-mod-filter/set/abstract/0_filter/filter_form/filtered_results_header.haml
+2 −2 card-mod-filter/set/abstract/0_filter/filter_form/offcanvas_filters.haml
+0 −1 card-mod-filter/set/abstract/0_filter/filter_form/open_filter_button.haml
+7 −0 card-mod-filter/set/abstract/0_filter/filter_form/open_filters_button.haml
+21 −17 card-mod-filter/set/abstract/0_filter/filter_input_fields.rb
+36 −0 card-mod-filter/set/abstract/1_filtered_body_toggle.rb
+23 −0 card-mod-filter/set/abstract/bar_box_toggle.rb
+1 −1 card-mod-flag/set/type/flag.rb
+4 −0 card-mod-logger/lib/card/mod/logger.rb
+4 −5 card-mod-logger/set/right/performance_log.rb
+1 −1 card-mod-logger/spec/cardio/logger/performance_spec.rb
+4 −4 card-mod-lookup/README.md
+10 −63 card-mod-lookup/lib/card/lookup_query.rb
+9 −2 card-mod-lookup/lib/card/lookup_query/filtering.rb
+67 −0 card-mod-lookup/lib/card/lookup_query/sorting.rb
+6 −2 card-mod-lookup/lib/lookup_table.rb
+3 −3 card-mod-lookup/lib/lookup_table/class_methods.rb
+0 −4 card-mod-new_relic/set/all/cache.rb
+1 −1 card-mod-new_relic/set/all/fetch.rb
+4 −4 card-mod-thumbnail/assets/style/thumbnail.scss
+10 −4 card-mod-thumbnail/set/abstract/thumbnail.rb
+1 −1 card-mod-thumbnail/set/abstract/thumbnail/thumbnail.haml
+1 −2 stale/email_remote_control/lib/gmail/labels.rb
+1 −1 stale/latex/lib/latex_document.rb
+1 −1 stale/latex/set/abstract/latex.rb
2 changes: 1 addition & 1 deletion vendor/decko

0 comments on commit b6fa56c

Please sign in to comment.