Merge pull request #5104 from ChrisBr/gems/remove-annotate

Properly remove annotate
openSUSE · Jun 7, 2018 · 5c50900 · 5c50900
2 parents 0871740 + 289da93
commit 5c50900
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 57 deletions.
diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -134,11 +134,6 @@ end
 group :development do
   # as alternative to the standard IRB shell
   gem 'unicorn-rails' # webrick won't work
-  # FIXME: Temporarily disabled until we either switch to bundle-gems service
-  #        or our gem packaging scripts have a way to deal with conflicting
-  #        executeables.
-  # for annotating models with schema info
-  # gem 'annotate'
 end
 
 group :development, :test do

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -56,9 +56,6 @@ GEM
       airbrake-ruby (~> 2.5)
     airbrake-ruby (2.5.0)
     amq-protocol (2.3.0)
-    annotate (2.7.4)
-      activerecord (>= 3.2, < 6.0)
-      rake (>= 10.4, < 13.0)
     ansi (1.5.0)
     arel (9.0.0)
     ast (2.4.0)
@@ -421,7 +418,6 @@ DEPENDENCIES
   addressable
   airbrake (<= 7.1.0)
   airbrake-ruby (<= 2.5.0)
-  annotate
   bcrypt
   bullet
   bunny

diff --git a/src/api/lib/tasks/auto_annotate_models.rake b/src/api/lib/tasks/auto_annotate_models.rake