Merge pull request #273 from shakacode/rails5

justin808 · justin808 · commit 97544c8d7ff3 · 2016-04-10T16:47:45.000-10:00
Need listen gem for Rails 5
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,7 @@ ruby "2.3.0"
 #
 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
 gem "rails", "5.0.0.beta3"
+gem "listen"
 
 # Note: We're using sqllite3 for development and testing
 gem "sqlite3", group: [:development, :test]
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -130,6 +130,9 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.13)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -209,6 +212,9 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
     react_on_rails (5.1.1)
@@ -340,6 +346,7 @@ DEPENDENCIES
   generator_spec
   jbuilder
   launchy
+  listen
   pg
   poltergeist
   pry

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ ruby "2.3.0"`
`4`	`4`	`#`
`5`	`5`	`# Bundle edge Rails instead: gem "rails", github: "rails/rails"`
`6`	`6`	`gem "rails", "5.0.0.beta3"`
	`7`	`+gem "listen"`
`7`	`8`
`8`	`9`	`# Note: We're using sqllite3 for development and testing`
`9`	`10`	`gem "sqlite3", group: [:development, :test]`