Merged master

Andrew Kane
2 parents e6cbe941 3ed70e68
Showing 5 changed files with 27 additions and 5 deletions Show diff stats
.travis.yml
Gemfile
gemfiles/activerecord31.gemfile
gemfiles/activerecord32.gemfile
gemfiles/activerecord40.gemfile
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1
 services:
   - elasticsearch
   - mongodb
@@ -16,6 +15,9 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
+  - gemfiles/activerecord40.gemfile
+  - gemfiles/activerecord32.gemfile
+  - gemfiles/activerecord31.gemfile
   - gemfiles/mongoid2.gemfile
   - gemfiles/mongoid3.gemfile
   - gemfiles/mongoid4.gemfile
@@ -4,7 +4,5 @@ source &#39;https://rubygems.org&#39;
 gemspec
  
 gem "sqlite3"
-gem "activerecord", ">= 3.1"
-# gem "activerecord", "~> 3.2.0"
-# gem "activerecord", "~> 3.1.0"
+gem "activerecord", "~> 4.1.0"
 gem "activejob_backport"
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "sqlite3"
+gem "activerecord", "~> 3.1.0"
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "sqlite3"
+gem "activerecord", "~> 3.2.0"
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "sqlite3"
+gem "activerecord", "~> 4.0.0"
+gem "activejob_backport"
1	1	language: ruby
2	2	rvm:
3		- - 1.9.3
4		- - 2.0.0
	3	+ - 2.1
5	4	services:
6	5	- elasticsearch
7	6	- mongodb
...	...	@@ -16,6 +15,9 @@ notifications:
16	15	on_failure: change
17	16	gemfile:
18	17	- Gemfile
	18	+ - gemfiles/activerecord40.gemfile
	19	+ - gemfiles/activerecord32.gemfile
	20	+ - gemfiles/activerecord31.gemfile
19	21	- gemfiles/mongoid2.gemfile
20	22	- gemfiles/mongoid3.gemfile
21	23	- gemfiles/mongoid4.gemfile
...	...
...	...	@@ -4,7 +4,5 @@ source 'https://rubygems.org'
4	4	gemspec
5	5
6	6	gem "sqlite3"
7		-gem "activerecord", ">= 3.1"
8		-# gem "activerecord", "~> 3.2.0"
9		-# gem "activerecord", "~> 3.1.0"
	7	+gem "activerecord", "~> 4.1.0"
10	8	gem "activejob_backport"
...	...
...	...	@@ -0,0 +1,7 @@
	1	+source 'https://rubygems.org'
	2	+
	3	+# Specify your gem's dependencies in searchkick.gemspec
	4	+gemspec path: "../"
	5	+
	6	+gem "sqlite3"
	7	+gem "activerecord", "~> 3.1.0"
...	...
...	...	@@ -0,0 +1,8 @@
	1	+source 'https://rubygems.org'
	2	+
	3	+# Specify your gem's dependencies in searchkick.gemspec
	4	+gemspec path: "../"
	5	+
	6	+gem "sqlite3"
	7	+gem "activerecord", "~> 4.0.0"
	8	+gem "activejob_backport"
...	...