Update devise from git and switch administrate repo

template.rb

@@ -38,9 +38,10 @@ def rails_6?
 end
 
 def add_gems
-  gem 'administrate', github: "thoughtbot/administrate"
+  gem 'administrate', github: "excid3/administrate", branch: 'jumpstart'
   gem 'bootstrap', '~> 4.3', '>= 4.3.1'
-  gem 'devise', '~> 4.6', '>= 4.6.1'
+  #gem 'devise', '~> 4.6', '>= 4.6.1'
+  gem 'devise', git: 'https://github.com/plataformatec/devise'
   gem 'devise-bootstrapped', github: 'excid3/devise-bootstrapped', branch: 'bootstrap4'
   gem 'devise_masquerade', '~> 0.6.2'
   gem 'font-awesome-sass', '~> 5.6', '>= 5.6.1'
@@ -179,9 +180,9 @@ end
 def add_administrate
   generate "administrate:install"
 
-  #gsub_file "app/dashboards/announcement_dashboard.rb",
-    #/announcement_type: Field::String/,
-    #"announcement_type: Field::Select.with_options(collection: Announcement::TYPES)"
+  gsub_file "app/dashboards/announcement_dashboard.rb",
+    /announcement_type: Field::String/,
+    "announcement_type: Field::Select.with_options(collection: Announcement::TYPES)"
 
   gsub_file "app/dashboards/user_dashboard.rb",
     /email: Field::String/,