alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary fix for mongoid dependency issue with rails 4.1 and removed mongoid-grid_fs

This commit is contained in:
manson 2014-06-03 10:12:13 +08:00
parent f98dc053f0
commit b9975fa7d5
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -24,13 +24,12 @@ gem 'active_model_serializers'
gem 'nokogiri' gem 'nokogiri'
#database #database
gem 'mongoid', github: "mongoid/mongoid" gem 'mongoid', github: "mongoid/mongoid", ref: 'f9e6fdb'
#file uploading and carrierwave #file uploading and carrierwave
gem "mini_magick", github: 'minimagick/minimagick' gem "mini_magick", github: 'minimagick/minimagick'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'mongoid-grid_fs', github: 'ahoward/mongoid-grid_fs'
gem 'kaminari' gem 'kaminari'
gem "impressionist" gem "impressionist"

1
app/controllers/admin/import_controller.rb
View File

@ -42,7 +42,6 @@ class Admin::ImportController < OrbitAdminController
@user = User.where(:user_name => "rulingcom").first @user = User.where(:user_name => "rulingcom").first
num = 0
@data.each do |row| @data.each do |row|
bulletin = Bulletin.new bulletin = Bulletin.new
bulletin.update_user = @user bulletin.update_user = @user