Skip to content

Commit 8d3b080

Browse files
committed
gems updated. meta_search disabled.
1 parent 3efc7e5 commit 8d3b080

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ source 'https://rubygems.org'
55
# development dependencies will be added by default to the :development group.
66
gemspec
77

8+
gem 'ransack', github: 'activerecord-hackery/ransack'
9+
10+
gem 'activeadmin', github: 'activeadmin'
811

912
# Test app stuff
1013

11-
gem 'rails', '~> 3.2.6'
14+
gem 'rails', '~> 4.0'
1215

1316
# Gems used only for assets and not required
1417
# in production environments by default.
1518
group :assets do
16-
gem 'sass-rails', '~> 3.2.3'
17-
gem 'coffee-rails', '~> 3.2.1'
19+
gem 'sass-rails', '~> 4.0'
20+
gem 'coffee-rails', '~> 4.0'
1821

1922
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
2023
# gem 'therubyracer', :platforms => :ruby

activeadmin-mongoid.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
1919
gem.license = 'MIT'
2020

2121
gem.add_runtime_dependency 'mongoid', ['> 3.0', '< 5.0']
22-
gem.add_runtime_dependency 'activeadmin', '~> 0.6'
22+
gem.add_runtime_dependency 'activeadmin', ['>= 1.0.0.pre', '< 2']
2323
gem.add_runtime_dependency 'jquery-rails', '< 3.0' # in which they remove jquery-ui
2424
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4', '< 5.0']
25-
gem.add_runtime_dependency 'meta_search', '~> 1.1.3'
25+
# gem.add_runtime_dependency 'meta_search', '~> 1.1.3'
2626

2727
gem.add_development_dependency 'rspec-rails', '~> 2.7'
2828
end

lib/active_admin/mongoid/document.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'delegate'
2-
require 'meta_search/searches/mongoid'
2+
# require 'meta_search/searches/mongoid'
33

44
module ActiveAdmin::Mongoid::Document
55
extend ActiveSupport::Concern

0 commit comments

Comments
 (0)