gems updated. meta_search disabled.

activeadmin · Nov 6, 2014 · 8d3b080 · 8d3b080
1 parent 3efc7e5
commit 8d3b080
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,16 +5,19 @@ source 'https://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
+gem 'ransack', github: 'activerecord-hackery/ransack'
+
+gem 'activeadmin', github: 'activeadmin'
 
 # Test app stuff
 
-gem 'rails', '~> 3.2.6'
+gem 'rails', '~> 4.0'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 4.0'
+  gem 'coffee-rails', '~> 4.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer', :platforms => :ruby

diff --git a/activeadmin-mongoid.gemspec b/activeadmin-mongoid.gemspec
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'mongoid',     ['> 3.0', '< 5.0']
-  gem.add_runtime_dependency 'activeadmin', '~> 0.6'
+  gem.add_runtime_dependency 'activeadmin', ['>= 1.0.0.pre', '< 2']
   gem.add_runtime_dependency 'jquery-rails', '< 3.0' # in which they remove jquery-ui
   gem.add_runtime_dependency 'sass-rails',  ['>= 3.1.4', '< 5.0']
-  gem.add_runtime_dependency 'meta_search',  '~> 1.1.3'
+  # gem.add_runtime_dependency 'meta_search',  '~> 1.1.3'
 
   gem.add_development_dependency 'rspec-rails',  '~> 2.7'
 end
diff --git a/lib/active_admin/mongoid/document.rb b/lib/active_admin/mongoid/document.rb
@@ -1,5 +1,5 @@
 require 'delegate'
-require 'meta_search/searches/mongoid'
+# require 'meta_search/searches/mongoid'
 
 module ActiveAdmin::Mongoid::Document
   extend ActiveSupport::Concern