Commit Graph

23 Commits

Author SHA1 Message Date
Washington Luiz b4973315e9 Merge branch 'master' into bring-rails-3
Conflicts:
	.travis.yml
	Gemfile
	README.md
	lib/ransack/adapters/active_record/3.0/context.rb
	lib/ransack/adapters/active_record/3.1/context.rb
	lib/ransack/adapters/active_record/3.2/context.rb
	lib/ransack/adapters/active_record/base.rb
	lib/ransack/adapters/active_record/context.rb
	lib/ransack/constants.rb
	lib/ransack/context.rb
	lib/ransack/helpers/form_builder.rb
	lib/ransack/helpers/form_helper.rb
	lib/ransack/nodes/attribute.rb
	lib/ransack/nodes/condition.rb
	lib/ransack/nodes/grouping.rb
	lib/ransack/nodes/sort.rb
	lib/ransack/predicate.rb
	lib/ransack/translate.rb
	ransack.gemspec
	spec/blueprints/people.rb
	spec/ransack/adapters/active_record/base_spec.rb
	spec/ransack/adapters/active_record/context_spec.rb
	spec/ransack/configuration_spec.rb
	spec/ransack/dependencies_spec.rb
	spec/ransack/helpers/form_builder_spec.rb
	spec/ransack/helpers/form_helper_spec.rb
	spec/ransack/predicate_spec.rb
	spec/ransack/search_spec.rb
	spec/ransack/translate_spec.rb
	spec/support/schema.rb
2014-04-10 00:28:29 -03:00
Washington Luiz e15a86cdd4 MOAR AR version checks for 4.1 and 4.0 support 2014-04-09 14:25:54 -03:00
Jon Atack d3a2d7cd9d Gemfile: gem 'arel', '< 5.0.0'
The Arel version 5 is incompatible with earlier Rails dependancies.
2014-02-27 18:16:02 +01:00
jonatack 776e0de64e Update Gemfile, gemspec and travis-ci
Tests should be passing now.
2014-01-01 02:22:10 +01:00
jonatack 72c193239b Revert last commit and commit the README as intended. 2013-12-18 20:45:49 +01:00
jonatack 884d1a2695 README: add links to github demo code, missing line spaces,
and activerecord-hackery links.
2013-12-18 20:39:33 +01:00
jonatack 9234f2370f Remove unneeded Rails 3 conditional from Gemfile 2013-12-07 02:08:31 +01:00
jonatack 0a2e4caaa9 Catch up with changes in master branch 2013-12-07 01:51:55 +01:00
Alejandro Babio 86edf0b068 Fix mysql issue on Rails 3.0 2013-12-04 12:09:33 -03:00
jonatack 5a522b4f4a Add Rails 4 compatibility to master 2013-08-06 19:00:52 +02:00
jonatack 62da375f0c Update Gemfile: Rails 4-0-stable default, new hash syntax,
and remove the polyamorous gem (which is already specified in the
gemspec).
2013-07-04 16:21:06 +02:00
jonatack e3914b814f Merge further elements from spectator's Rails 3 comptability work, merge pull request #208 from pdf/reorder, use Rails 4 active-record distinct method which replaces uniq 2013-05-23 13:33:00 +02:00
jonatack 80dba12b42 Gemfile and fix typos 2013-05-21 00:33:25 +02:00
Andrew Vit 9b9fd09915 Fix errors and warnings with specs on rails 4.0 2013-04-08 09:10:53 +10:00
Ryan Bigg fc8151ac49 Test against Rails 3-2-stable and Arel latest gem release only 2012-03-29 08:19:01 -05:00
Ernie Miller e20c4dfc24 Version bump, Rails 3.2 compat (fixes #49) 2012-01-20 15:13:27 -05:00
Ernie Miller e10ae633ed Use Travis CI env to set Rails version 2012-01-19 09:06:10 -05:00
Ernie Miller 50b53f2046 Update gemfile to stick with 3.1 for now 2011-11-01 14:20:31 -04:00
Ernie Miller 62b7bd2de8 Enable TravisCI, add spec for add_predicate 2011-07-17 19:04:00 -04:00
Ernie Miller 1787325fc2 Oops. Left debugging gem in Gemfile 2011-06-27 18:58:30 -04:00
Ernie Miller 61e455e8bc Update gem requirements and remove some useless comments. 2011-06-27 18:55:50 -04:00
Ernie Miller f151d62d22 API for ransackable_attributes should be to use super and filter in a method. 2011-05-30 11:14:30 -04:00
Ernie Miller 294015309b Initial commit. 2011-03-30 20:31:39 -04:00