diff --git a/Gemfile b/Gemfile index db949e8..08c23aa 100644 --- a/Gemfile +++ b/Gemfile @@ -24,13 +24,12 @@ gem 'active_model_serializers' gem 'nokogiri' #database -gem 'mongoid', github: "mongoid/mongoid" +gem 'mongoid', github: "mongoid/mongoid", ref: 'f9e6fdb' #file uploading and carrierwave gem "mini_magick", github: 'minimagick/minimagick' gem 'carrierwave' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' -gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs' gem 'kaminari' gem "impressionist" diff --git a/app/controllers/admin/import_controller.rb b/app/controllers/admin/import_controller.rb index 72b9770..c832a03 100644 --- a/app/controllers/admin/import_controller.rb +++ b/app/controllers/admin/import_controller.rb @@ -42,7 +42,6 @@ class Admin::ImportController < OrbitAdminController @user = User.where(:user_name => "rulingcom").first - num = 0 @data.each do |row| bulletin = Bulletin.new bulletin.update_user = @user