Merge branch 'develop'

.github/config.yml

@@ -1,10 +1,18 @@
 newIssueWelcomeComment: >
   感谢你提交的问题或反馈，我会在有时间的时候回复在此期间你可以看看[之前被解决的反馈](https://github.com/tryzealot/zealot/issues?q=is%3Aissue+is%3Aclosed)说不定有你需要的答案。
+  
+  Thanks for opening this issue, a maintainer will get back to you shortly!
+  
 
 newPRWelcomeComment: >
   感谢你提交的问题或反馈，我会在有时间的时候来审查代码。
+  
+  Thanks so much for opening your first PR here!
+
 
 firstPRMergeComment: >
   感谢贡献 PR 来支持 Zealot! :tada:
+  
+  Congrats on merging your first pull request here! :tada: How awesome!
 
   ![Congrats!](https://media.giphy.com/media/Tugu78Y5vg0Ss/giphy.gif)

.github/stale.yml

@@ -13,6 +13,10 @@ staleLabel: wontfix
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   由于太长时间没有得到回复本问题会自动被关闭，如果您还有问题可以重新开启或提交新问题。感谢你对于 Zealot 的关注！
+  
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
 
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
   TargetRubyVersion: 2.7
   TargetRailsVersion: 6.1
   DisabledByDefault: true
+  SuggestExtensions: false
   Exclude:
     - 'vendor/**/*'
     - 'node_modules/**/*'
@@ -26,11 +27,12 @@ Style/FrozenStringLiteralComment:
 
 # Some blocks are longer.
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
     - 'namespace'
     - 'create_table'
   Exclude:
     - 'config/**/*.rb'
+    - 'app/models/setting.rb'
     - 'spec/**/*.rb'
     - 'lib/tasks/**/*'
     - 'lib/backup/**/*'
@@ -47,14 +49,16 @@ Metrics/MethodLength:
   Max: 60
 
 Metrics/ClassLength:
-  Max: 150
+  Max: 180
+  Exclude:
+    - 'app/models/setting.rb'
 
 Metrics/ModuleLength:
-  Max: 150
+  Max: 180
 
 # Raise complexity metrics
 Metrics/AbcSize:
-  Max: 20
+  Max: 40
   Exclude:
     - 'lib/backup/**/*'
 

Dockerfile

@@ -61,7 +61,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="4.3.0"
+ARG ZEALOT_VERSION="4.3.1"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"

Gemfile

@@ -18,7 +18,7 @@ gem 'lograge', '~> 0.11.2'
 
 # API
 gem 'active_model_serializers', '~> 0.10.12'
-gem 'graphql', '~> 1.13.0'
+gem 'graphql', '~> 1.13.2'
 gem 'rack-cors', '~> 1.1.1'
 gem 'health_check', '~> 3.1.0'
 
@@ -85,7 +85,7 @@ gem 'turbolinks', '~> 5'
 gem 'webpacker', '~> 5.4'
 
 # 用于解析 iOS, Android 和 macOS 应用
-gem 'app-info', '~> 2.7.0'
+gem 'app-info', '~> 2.8.1'
 
 # 带缓存的配置库
 gem 'rails-settings-cached', '~> 2.8.1'

Gemfile.lock

@@ -1,42 +1,42 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.4)
+    CFPropertyList (3.0.5)
       rexml
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -48,40 +48,40 @@ GEM
       activemodel (>= 4.1, < 6.2)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
       globalid (>= 0.3.6)
     activejob-status (0.2.2)
       activejob (>= 4.2)
       activesupport (>= 4.2)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activestorage (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    android_parser (2.4.1)
-      rubyzip (>= 1.0.0)
-    app-info (2.7.0)
+    android_parser (2.5.0)
+      rubyzip (>= 1.0, < 3.0)
+    app-info (2.8.1)
       CFPropertyList (>= 2.3.4, < 3.1.0)
-      android_parser (~> 2.4.1)
+      android_parser (~> 2.5.0)
       google-protobuf (~> 3.18.0)
       icns (~> 0.2.0)
-      image_size (>= 1.5, < 2.2)
+      image_size (>= 1.5, < 3.1)
       ruby-macho (>= 1.4, < 3)
       rubyzip (>= 1.2, < 3.0)
       uuidtools (>= 2.1.5, < 2.3.0)
@@ -172,13 +172,13 @@ GEM
       omniauth (~> 1.3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     google-protobuf (3.18.1)
     graphiql-rails (1.8.0)
       railties
       sprockets-rails
-    graphql (1.13.0)
+    graphql (1.13.2)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -223,7 +223,7 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    image_size (2.1.2)
+    image_size (3.0.1)
     interception (0.5)
     ipaddr (1.2.2)
     jb (0.8.0)
@@ -269,7 +269,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -278,9 +278,9 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mixlib-shellout (3.2.5)
       chef-utils
     msgpack (1.4.2)
@@ -354,20 +354,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (6.1.4.4)
+      actioncable (= 6.1.4.4)
+      actionmailbox (= 6.1.4.4)
+      actionmailer (= 6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actiontext (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -379,9 +379,9 @@ GEM
       railties (>= 6.0.0, < 7)
     rails-settings-cached (2.8.1)
       rails (>= 5.0.0)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
@@ -474,9 +474,9 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
     sys-filesystem (1.4.3)
@@ -528,7 +528,7 @@ DEPENDENCIES
   active_analytics
   active_model_serializers (~> 0.10.12)
   activejob-status
-  app-info (~> 2.7.0)
+  app-info (~> 2.8.1)
   awesome_print
   better_errors
   binding_of_caller
@@ -542,7 +542,7 @@ DEPENDENCIES
   friendly_id (~> 5.4.2)
   gitlab_omniauth-ldap (~> 2.1.1)
   graphiql-rails
-  graphql (~> 1.13.0)
+  graphql (~> 1.13.2)
   guard (~> 2.18.0)
   guard-bundler
   guard-migrate

README.md

@@ -6,7 +6,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/5e5c7bbeb1214fa39b11a7414f0d7171)](https://www.codacy.com/gh/tryzealot/zealot)
 [![License](https://img.shields.io/github/license/tryzealot/zealot)](LICENSE)
 
-[Enligsh Document](https://zealot.ews.im/#/en/) | [简体中文文档](https://zealot.ews.im)
+[English Document](https://zealot.ews.im/#/en/) | [简体中文文档](https://zealot.ews.im)
 
 开源自部署 iOS、Android 及 macOS 应用分发平台，提供 iOS、Android SDK、fastlane 等丰富组件库，打包分发流程、上传应用竟然如此简单、独立部署解决企业使用的烦恼。 En Taro Adun! 🖖
 
@@ -71,4 +71,4 @@ https://zealot.ews.im/#/changelog
 
 https://zealot.ews.im
 
-对 Zealot 有疑问或者建议，欢迎[提交问题](https://github.com/tryzealot/zealot/issues/new)，我会非常欢迎的。
+对 Zealot 有疑问或者建议，欢迎[提交问题](https://github.com/tryzealot/zealot/issues/new)，我会非常欢迎的。