5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-16 04:41:42 +00:00

Merge branch 'issue-9357-2' into 'rails'
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

Issue #9357

See merge request sutty/sutty!186
This commit is contained in:
fauno 2023-08-22 21:14:42 +00:00
commit ee59a5700c
6 changed files with 46 additions and 92 deletions

2
.gitattributes vendored
View file

@ -1,2 +0,0 @@
public/assets/** filter=lfs diff=lfs merge=lfs -text
public/packs/** filter=lfs diff=lfs merge=lfs -text

View file

@ -20,6 +20,7 @@ pipeline:
branch: branch:
- "rails" - "rails"
- "panel.sutty.nl" - "panel.sutty.nl"
- "17.3.alpine.panel.sutty.nl"
event: "push" event: "push"
path: path:
include: include:
@ -27,7 +28,7 @@ pipeline:
- ".dockerignore" - ".dockerignore"
- ".woodpecker.yml" - ".woodpecker.yml"
assets: assets:
image: "gitea.nulo.in/sutty/panel:${ALPINE_VERSION}-${RUBY_VERSION}.${RUBY_PATCH}" image: "gitea.nulo.in/sutty/panel:3.14.10-2.7.8"
commands: commands:
- "apk add python2 dotenv openssh-client brotli" - "apk add python2 dotenv openssh-client brotli"
- "install -d -m 700 ~/.ssh/" - "install -d -m 700 ~/.ssh/"
@ -51,6 +52,9 @@ pipeline:
- "git add public && git commit -m \"ci: assets [skip ci]\"" - "git add public && git commit -m \"ci: assets [skip ci]\""
- "git pull upstream ${CI_COMMIT_BRANCH}" - "git pull upstream ${CI_COMMIT_BRANCH}"
- "git push upstream ${CI_COMMIT_BRANCH}" - "git push upstream ${CI_COMMIT_BRANCH}"
environment:
- "RUBY_VERSION=${RUBY_VERSION}"
- "GEMS_SOURCE=https://14.3.alpine.gems.sutty.nl"
secrets: secrets:
- "SSH_KEY" - "SSH_KEY"
- "KNOWN_HOSTS" - "KNOWN_HOSTS"
@ -65,8 +69,15 @@ pipeline:
- "app/javascript/**/*" - "app/javascript/**/*"
- "package.json" - "package.json"
- "yarn.lock" - "yarn.lock"
matrix:
ALPINE_VERSION: "3.14.10"
RUBY_VERSION: "2.7"
RUBY_PATCH: "8"
matrix: matrix:
include: include:
- ALPINE_VERSION: "3.17.3"
RUBY_VERSION: "3.1"
RUBY_PATCH: "4"
- ALPINE_VERSION: "3.14.10" - ALPINE_VERSION: "3.14.10"
RUBY_VERSION: "2.7" RUBY_VERSION: "2.7"
RUBY_PATCH: "8" RUBY_PATCH: "8"

13
Gemfile
View file

@ -1,9 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
puts 'Usa haini.sh para generar un entorno de trabajo reproducible' source ENV.fetch('GEMS_SOURCE', 'https://17.3.alpine.gems.sutty.nl')
source 'https://gems.sutty.nl'
ruby '~> 2.7' ruby "~> #{ENV.fetch('RUBY_VERSION', '3.1')}"
gem 'dotenv-rails', require: 'dotenv/rails-now' gem 'dotenv-rails', require: 'dotenv/rails-now'
@ -55,7 +54,7 @@ gem 'httparty'
gem 'safe_yaml', require: false gem 'safe_yaml', require: false
gem 'jekyll', '~> 4.2.0' gem 'jekyll', '~> 4.2.0'
gem 'jekyll-data' gem 'jekyll-data'
gem 'jekyll-commonmark' gem 'jekyll-commonmark', '~> 1.4.0'
gem 'jekyll-images' gem 'jekyll-images'
gem 'jekyll-include-cache' gem 'jekyll-include-cache'
gem 'sutty-liquid', '>= 0.7.3' gem 'sutty-liquid', '>= 0.7.3'
@ -120,11 +119,11 @@ group :development do
gem 'brakeman' gem 'brakeman'
gem 'haml-lint', require: false gem 'haml-lint', require: false
gem 'letter_opener' gem 'letter_opener'
gem 'listen', '>= 3.0.5', '< 3.2' gem 'listen'
gem 'rubocop-rails' gem 'rubocop-rails'
gem 'spring' gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0' gem 'spring-watcher-listen'
gem 'web-console', '>= 3.3.0' gem 'web-console'
end end
group :test do group :test do

View file

@ -25,7 +25,7 @@ GIT
groupdate (>= 5.2) groupdate (>= 5.2)
GEM GEM
remote: https://gems.sutty.nl/ remote: https://17.3.alpine.gems.sutty.nl/
specs: specs:
actioncable (6.1.7.3) actioncable (6.1.7.3)
actionpack (= 6.1.7.3) actionpack (= 6.1.7.3)
@ -91,11 +91,9 @@ GEM
ast (2.4.2) ast (2.4.2)
autoprefixer-rails (10.4.13.0) autoprefixer-rails (10.4.13.0)
execjs (~> 2) execjs (~> 2)
bcrypt (3.1.18-x86_64-linux-musl) bcrypt (3.1.19-x86_64-linux-musl)
bcrypt_pbkdf (1.1.0)
bcrypt_pbkdf (1.1.0-x86_64-linux-musl) bcrypt_pbkdf (1.1.0-x86_64-linux-musl)
benchmark-ips (2.12.0) benchmark-ips (2.12.0)
bindex (0.8.1)
bindex (0.8.1-x86_64-linux-musl) bindex (0.8.1-x86_64-linux-musl)
blazer (2.6.5) blazer (2.6.5)
activerecord (>= 5) activerecord (>= 5)
@ -119,8 +117,7 @@ GEM
climate_control (1.2.0) climate_control (1.2.0)
coderay (1.1.3) coderay (1.1.3)
colorator (1.1.0) colorator (1.1.0)
commonmarker (0.23.9) commonmarker (0.23.10-x86_64-linux-musl)
commonmarker (0.23.9-x86_64-linux-musl)
concurrent-ruby (1.2.2) concurrent-ruby (1.2.2)
concurrent-ruby-ext (1.2.2-x86_64-linux-musl) concurrent-ruby-ext (1.2.2-x86_64-linux-musl)
concurrent-ruby (= 1.2.2) concurrent-ruby (= 1.2.2)
@ -131,7 +128,6 @@ GEM
activerecord (>= 5.a) activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0) database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1) database_cleaner-core (2.0.1)
date (3.3.3)
date (3.3.3-x86_64-linux-musl) date (3.3.3-x86_64-linux-musl)
dead_end (4.0.0) dead_end (4.0.0)
derailed_benchmarks (2.1.2) derailed_benchmarks (2.1.2)
@ -154,7 +150,7 @@ GEM
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (1.11.0) devise-i18n (1.11.0)
devise (>= 4.9.0) devise (>= 4.9.0)
devise_invitable (2.0.7) devise_invitable (2.0.8)
actionmailer (>= 5.0) actionmailer (>= 5.0)
devise (>= 4.6) devise (>= 4.6)
distributed-press-api-client (0.2.4) distributed-press-api-client (0.2.4)
@ -196,14 +192,12 @@ GEM
dry-inflector (~> 1.0) dry-inflector (~> 1.0)
dry-logic (~> 1.4) dry-logic (~> 1.4)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
ed25519 (1.3.0)
ed25519 (1.3.0-x86_64-linux-musl) ed25519 (1.3.0-x86_64-linux-musl)
em-websocket (0.5.3) em-websocket (0.5.3)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0) http_parser.rb (~> 0)
errbase (0.2.2) errbase (0.2.2)
erubi (1.12.0) erubi (1.12.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x86_64-linux-musl) eventmachine (1.2.7-x86_64-linux-musl)
exception_notification (4.5.0) exception_notification (4.5.0)
actionmailer (>= 5.2, < 8) actionmailer (>= 5.2, < 8)
@ -214,11 +208,8 @@ GEM
factory_bot_rails (6.2.0) factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0) factory_bot (~> 6.2.0)
railties (>= 5.0.0) railties (>= 5.0.0)
fast_blank (1.0.1)
fast_blank (1.0.1-x86_64-linux-musl) fast_blank (1.0.1-x86_64-linux-musl)
fast_jsonparser (0.5.0)
fast_jsonparser (0.5.0-x86_64-linux-musl) fast_jsonparser (0.5.0-x86_64-linux-musl)
ffi (1.15.5)
ffi (1.15.5-x86_64-linux-musl) ffi (1.15.5-x86_64-linux-musl)
flamegraph (0.9.5) flamegraph (0.9.5)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
@ -234,7 +225,7 @@ GEM
activerecord (>= 6.0, < 8) activerecord (>= 6.0, < 8)
ruby2ruby (~> 2.4) ruby2ruby (~> 2.4)
ruby_parser (~> 3.10) ruby_parser (~> 3.10)
haml (6.1.1-x86_64-linux-musl) haml (6.1.2-x86_64-linux-musl)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
@ -246,10 +237,6 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (3.0.3)
temple (>= 0.8.2)
thor
tilt
hamlit (3.0.3-x86_64-linux-musl) hamlit (3.0.3-x86_64-linux-musl)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
@ -261,14 +248,12 @@ GEM
railties (>= 4.0.1) railties (>= 4.0.1)
heapy (0.2.0) heapy (0.2.0)
thor thor
hiredis (0.6.3)
hiredis (0.6.3-x86_64-linux-musl) hiredis (0.6.3-x86_64-linux-musl)
http_parser.rb (0.8.0)
http_parser.rb (0.8.0-x86_64-linux-musl) http_parser.rb (0.8.0-x86_64-linux-musl)
httparty (0.21.0) httparty (0.21.0)
mini_mime (>= 1.0.0) mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (1.13.0) i18n (1.14.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
icalendar (2.8.0) icalendar (2.8.0)
ice_cube (~> 0.16) ice_cube (~> 0.16)
@ -334,10 +319,9 @@ GEM
letter_opener (1.8.1) letter_opener (1.8.1)
launchy (>= 2.2, < 3) launchy (>= 2.2, < 3)
liquid (4.0.4) liquid (4.0.4)
listen (3.1.5) listen (3.8.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.10)
ruby_dep (~> 1.2)
loaf (0.10.0) loaf (0.10.0)
railties (>= 3.2) railties (>= 3.2)
lockbox (1.2.0) lockbox (1.2.0)
@ -361,6 +345,7 @@ GEM
mini_histogram (0.3.1) mini_histogram (0.3.1)
mini_magick (4.12.0) mini_magick (4.12.0)
mini_mime (1.1.2) mini_mime (1.1.2)
mini_portile2 (2.8.2)
minitest (5.18.0) minitest (5.18.0)
mobility (1.2.9) mobility (1.2.9)
i18n (>= 0.6.10, < 2) i18n (>= 0.6.10, < 2)
@ -381,7 +366,8 @@ GEM
njalla-api-client (0.2.0) njalla-api-client (0.2.0)
dry-schema dry-schema
httparty (~> 0.18) httparty (~> 0.18)
nokogiri (1.15.1-x86_64-linux) nokogiri (1.15.4-x86_64-linux-musl)
mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pairing_heap (3.0.1) pairing_heap (3.0.1)
@ -400,14 +386,13 @@ GEM
pry (0.14.2) pry (0.14.2)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
public_suffix (5.0.1) public_suffix (5.0.3)
puma (6.2.2-x86_64-linux-musl) puma (6.3.1-x86_64-linux-musl)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.3.0) pundit (2.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
que (2.2.1) que (2.2.1)
racc (1.6.2) racc (1.7.1-x86_64-linux-musl)
racc (1.6.2-x86_64-linux-musl)
rack (2.2.7) rack (2.2.7)
rack-cors (2.0.1) rack-cors (2.0.1)
rack (>= 2.0.0) rack (>= 2.0.0)
@ -498,7 +483,6 @@ GEM
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0) rubocop (>= 1.33.0, < 2.0)
ruby-filemagic (0.7.3)
ruby-filemagic (0.7.3-x86_64-linux-musl) ruby-filemagic (0.7.3-x86_64-linux-musl)
ruby-progressbar (1.13.0) ruby-progressbar (1.13.0)
ruby-statistics (3.0.2) ruby-statistics (3.0.2)
@ -507,17 +491,13 @@ GEM
ruby2ruby (2.5.0) ruby2ruby (2.5.0)
ruby_parser (~> 3.1) ruby_parser (~> 3.1)
sexp_processor (~> 4.6) sexp_processor (~> 4.6)
ruby_dep (1.5.0)
ruby_parser (3.20.1) ruby_parser (3.20.1)
sexp_processor (~> 4.16) sexp_processor (~> 4.16)
rubyzip (2.3.2) rubyzip (2.3.2)
rugged (1.6.3)
rugged (1.6.3-x86_64-linux-musl) rugged (1.6.3-x86_64-linux-musl)
safe_yaml (1.0.6) safe_yaml (1.0.6)
safely_block (0.3.0) safely_block (0.3.0)
errbase (>= 0.1.1) errbase (>= 0.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc (2.4.0-x86_64-linux-musl) sassc (2.4.0-x86_64-linux-musl)
ffi (~> 1.9) ffi (~> 1.9)
sassc-rails (2.1.2) sassc-rails (2.1.2)
@ -535,10 +515,10 @@ GEM
simpleidn (0.2.1) simpleidn (0.2.1)
unf (~> 0.1.4) unf (~> 0.1.4)
sourcemap (0.1.1) sourcemap (0.1.1)
spring (2.1.1) spring (4.1.1)
spring-watcher-listen (2.0.1) spring-watcher-listen (2.1.0)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0) spring (>= 4)
sprockets (4.2.0) sprockets (4.2.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4) rack (>= 2.2.4, < 4)
@ -546,10 +526,11 @@ GEM
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.6.3-x86_64-linux) sqlite3 (1.6.3-x86_64-linux-musl)
mini_portile2 (~> 2.8.0)
stackprof (0.2.25-x86_64-linux-musl) stackprof (0.2.25-x86_64-linux-musl)
stream (0.5.5) stream (0.5.5)
sutty-liquid (0.11.10) sutty-liquid (0.11.11)
fast_blank (~> 1.0) fast_blank (~> 1.0)
jekyll (~> 4) jekyll (~> 4)
symbol-fstring (1.0.2-x86_64-linux-musl) symbol-fstring (1.0.2-x86_64-linux-musl)
@ -589,7 +570,7 @@ GEM
semantic_range (>= 2.3.0) semantic_range (>= 2.3.0)
webrick (1.8.1) webrick (1.8.1)
websocket (1.2.9) websocket (1.2.9)
websocket-driver (0.7.5-x86_64-linux-musl) websocket-driver (0.7.6-x86_64-linux-musl)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
xpath (3.2.0) xpath (3.2.0)
@ -597,7 +578,6 @@ GEM
zeitwerk (2.6.8) zeitwerk (2.6.8)
PLATFORMS PLATFORMS
ruby
x86_64-linux-musl x86_64-linux-musl
DEPENDENCIES DEPENDENCIES
@ -636,13 +616,13 @@ DEPENDENCIES
inline_svg inline_svg
jbuilder (~> 2.5) jbuilder (~> 2.5)
jekyll (~> 4.2.0) jekyll (~> 4.2.0)
jekyll-commonmark jekyll-commonmark (~> 1.4.0)
jekyll-data jekyll-data
jekyll-images jekyll-images
jekyll-include-cache jekyll-include-cache
kaminari kaminari
letter_opener letter_opener
listen (>= 3.0.5, < 3.2) listen
loaf loaf
lockbox lockbox
lograge lograge
@ -677,7 +657,7 @@ DEPENDENCIES
selenium-webdriver (~> 4.8.0) selenium-webdriver (~> 4.8.0)
sourcemap sourcemap
spring spring
spring-watcher-listen (~> 2.0.0) spring-watcher-listen
sqlite3 sqlite3
stackprof stackprof
sutty-liquid (>= 0.7.3) sutty-liquid (>= 0.7.3)
@ -687,12 +667,12 @@ DEPENDENCIES
turbolinks (~> 5) turbolinks (~> 5)
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
validates_hostname validates_hostname
web-console (>= 3.3.0) web-console
webpacker webpacker
yaml_db! yaml_db!
RUBY VERSION RUBY VERSION
ruby 2.7.1p83 ruby 3.1.4p223
BUNDLED WITH BUNDLED WITH
2.2.20 2.4.17

View file

@ -1,22 +0,0 @@
# frozen_string_literal: true
require 'json/add/exception'
module ActiveJob
module Serializers
class ExceptionSerializer < ObjectSerializer # :nodoc:
def serialize(ex)
super('value' => { 'class' => ex.class.name, 'exception' => ex.as_json })
end
def deserialize(hash)
hash.dig('value', 'class').constantize.json_create(hash.dig('value', 'exception'))
end
private
def klass
Exception
end
end
end
end

View file

@ -1,12 +0,0 @@
# frozen_string_literal: true
# Que
class CreateQueTables < ActiveRecord::Migration[6.1]
def up
Que.migrate! version: 7
end
def down
Que.migrate! version: 0
end
end