Merge pull request mloughran#12 from halo/ruby-2-2-compat

Compatibility with Ruby 2.2
YourAcclaim · May 28, 2015 · 9dd93b4 · 9dd93b4
2 parents 50b18ef + 2088d29
commit 9dd93b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.2.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
       eventmachine
       rspec (> 2.6.0)
       test-unit
-    eventmachine (1.0.3)
+    eventmachine (1.0.7)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ rvm: @@
       - 1.9.2
       - 1.9.3
       - 2.0.0
+      - 2.2.0
       - jruby-18mode
       - jruby-19mode
       - rbx-18mode
@@ Expand Down @@