From ba1115f1f3e6451483c4cafff3d4433452628c59 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Mon, 23 Nov 2020 10:53:59 +0800
Subject: [PATCH] ADD annotate for models and migration with auto generate

---
 Gemfile      |  3 +--
 Gemfile.lock | 20 ++++----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 491b512c2..219c5c426 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,8 +19,6 @@ gem 'kaminari', '~> 1.1', '>= 1.1.1'
 
 gem 'bootsnap', '>= 1.1.0', require: false
 
-gem 'gitlab', path: 'lib/gitlab-cli'
-
 gem 'chinese_pinyin'
 
 gem 'rack-cors'
@@ -74,6 +72,7 @@ group :development do
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem "annotate", "~> 2.6.0"
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index c67bcd22d..db7daf602 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-PATH
-  remote: lib/gitlab-cli
-  specs:
-    gitlab (3.2.0)
-      httparty
-      terminal-table
-
 GEM
   remote: https://gems.ruby-china.com/
   specs:
@@ -61,6 +54,9 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ancestry (3.0.7)
       activerecord (>= 3.2.0)
+    annotate (2.6.5)
+      activerecord (>= 2.3.0)
+      rake (>= 0.8.7)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
@@ -138,9 +134,6 @@ GEM
     harmonious_dictionary (0.0.1)
     hashie (3.6.0)
     htmlentities (4.3.4)
-    httparty (0.18.0)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
@@ -177,9 +170,6 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -402,8 +392,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -437,6 +425,7 @@ DEPENDENCIES
   acts-as-taggable-on (~> 6.0)
   acts_as_list
   ancestry
+  annotate (~> 2.6.0)
   awesome_print
   axlsx (~> 3.0.0.pre)
   axlsx_rails (~> 0.5.2)
@@ -452,7 +441,6 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitlab!
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)