Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
icyleaf committed Jun 20, 2024
2 parents 98670cd + d3d3e74 commit e7b0e71
Show file tree
Hide file tree
Showing 51 changed files with 1,316 additions and 486 deletions.
8 changes: 5 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ Layout/LineLength:
Exclude:
- 'config/**/*.rb'
- 'spec/**/*.rb'
- 'lib/zealot/backup/manager.rb'
- lib/zealot/backup/manager.rb
- app/services/create_sample_apps_service.rb

Metrics/MethodLength:
Max: 60

Metrics/ClassLength:
Max: 250
Exclude:
- 'app/models/release.rb'
- app/models/release.rb

Metrics/ModuleLength:
Max: 180
Expand All @@ -57,6 +58,7 @@ Metrics/AbcSize:
Max: 40
Exclude:
- 'lib/backup/**/*'
- app/models/apple_key.rb

Style/Alias:
EnforcedStyle: prefer_alias_method
Expand Down Expand Up @@ -102,7 +104,7 @@ Style/TrailingCommaInHashLiteral:
Naming/PredicateName:
Enabled: true
Exclude:
- 'app/serializers/channel_serializer.rb'
- app/serializers/channel_serializer.rb

Layout/HashAlignment:
Enabled: false
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3-alpine as builder
FROM ruby:3.3.3-alpine as builder

ARG BUILD_PACKAGES="build-base libxml2 libxslt git"
ARG DEV_PACKAGES="libxml2-dev libxslt-dev yaml-dev postgresql-dev nodejs npm yarn imagemagick-dev libwebp-dev libpng-dev tiff-dev gcompat"
Expand Down Expand Up @@ -58,13 +58,13 @@ RUN rm -rf docker node_modules tmp/cache spec .browserslistrc babel.config.js \

##################################################################################

FROM ruby:3.3-alpine
FROM ruby:3.3.3-alpine

ARG BUILD_DATE
ARG VCS_REF
ARG TAG

ARG ZEALOT_VERSION="5.3.0"
ARG ZEALOT_VERSION="5.3.1"
ARG REPLACE_CHINA_MIRROR="true"
ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem 'lograge', '~> 0.14.0'

# API
gem 'active_model_serializers', '~> 0.10.14'
gem 'graphql', '~> 2.3.4'
gem 'graphql', '~> 2.3.5'
gem 'rack-cors', '~> 2.0.2'
gem 'health_check', '~> 3.1.0'
gem 'tiny_appstore_connect', '~> 0.1.12'
Expand All @@ -40,7 +40,7 @@ gem 'webp-ffi', '~> 0.4.0'
# Helper
gem 'rails-settings-cached', '~> 2.9.4'
gem 'app-info', '~> 3.0.0'
gem 'faraday', '~> 2.9.0'
gem 'faraday', '~> 2.9.2'
gem 'rqrcode'

## Auth
Expand All @@ -62,7 +62,7 @@ gem 'openssl', '~> 3.2.0'
gem 'plist', '~> 3.7.1'

## OS
gem 'sys-filesystem', '~> 1.4.5'
gem 'sys-filesystem', '~> 1.5.0'
gem 'vmstat', '~> 2.3.0'
gem 'pghero', '~> 3.5.0'

Expand All @@ -74,7 +74,7 @@ gem 'sentry-rails', '~> 5.17.3'
gem 'improved_jenkins_client', '~> 1.6.7'

# Background job
gem 'good_job', '~> 3.29.2'
gem 'good_job', '~> 3.29.4'
gem 'activejob-status', '~> 1.0.2'

# Assets
Expand Down
Loading

0 comments on commit e7b0e71

Please sign in to comment.