Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
icyleaf committed Jul 8, 2024
2 parents c89a645 + fd667b5 commit 2392236
Show file tree
Hide file tree
Showing 27 changed files with 336 additions and 117 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ARG BUILD_DATE
ARG VCS_REF
ARG TAG

ARG ZEALOT_VERSION="5.3.3"
ARG ZEALOT_VERSION="5.3.4"
ARG REPLACE_CHINA_MIRROR="true"
ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"
Expand Down
13 changes: 6 additions & 7 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.5'
gem 'graphql', '~> 2.3.6'
gem 'rack-cors', '~> 2.0.2'
gem 'health_check', '~> 3.1.0'
gem 'tiny_appstore_connect', '~> 0.1.12'
Expand All @@ -39,7 +39,7 @@ gem 'webp-ffi', '~> 0.4.0'

# Helper
gem 'rails-settings-cached', '~> 2.9.4'
gem 'app-info', '~> 3.0.0'
gem 'app-info', '~> 3.1.4'
gem 'faraday', '~> 2.9.2'
gem 'rqrcode'

Expand All @@ -54,8 +54,7 @@ gem 'omniauth-google-oauth2', '~> 1.0.1'
gem 'omniauth-gitlab', '~> 3.0.0'
gem 'omniauth-feishu', '~> 0.1.8'
gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap'
gem 'nkf', '~> 0.2.0' # requires for gitlab_omniauth-ldap in Ruby 3.3
gem 'omniauth_openid_connect', '0.7.1'
gem 'omniauth_openid_connect', '0.8.0'

## UDID
gem 'openssl', '~> 3.2.0'
Expand All @@ -67,14 +66,14 @@ gem 'vmstat', '~> 2.3.0'
gem 'pghero', '~> 3.5.0'

## Exception handler
gem 'sentry-ruby', '~> 5.17.3'
gem 'sentry-rails', '~> 5.17.3'
gem 'sentry-ruby', '~> 5.18.0'
gem 'sentry-rails', '~> 5.18.1'

## Jenkins SDK
gem 'improved_jenkins_client', '~> 1.6.7'

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

# Assets
Expand Down
Loading

0 comments on commit 2392236

Please sign in to comment.