ALLOW TRAVIS TO RUN. DON'T MERGE.

bquorning · bquorning · commit f8dbe7cb4f5d · 2016-03-09T15:24:55.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -114,3 +114,4 @@ branches:
   only:
     - master
     - /^\d+-\d+-maintenance$/
+    - fix_empty_view_rendering
diff --git a/example_app_generator/generate_app.rb b/example_app_generator/generate_app.rb
@@ -32,6 +32,8 @@
     |# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
     |gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
     |
+    |gem 'rake', '~> 10.0', '< 11'
+    |
     |gem 'rspec-rails',
     |    :path => '#{rspec_rails_repo_path}',
     |    :groups => [:development, :test]
diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     end
   end
 
-  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'rake',     '~> 10.0', '< 11'
   s.add_development_dependency 'cucumber', '~> 1.3.5'
   s.add_development_dependency 'aruba',    '~> 0.5.4'
   s.add_development_dependency 'ammeter',  '1.1.2'

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`\|# Rack::Cache 1.3.0 requires Ruby >= 2.0.0`
`33`	`33`	`\|gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'`
`34`	`34`	`\|`
	`35`	`+ \|gem 'rake', '~> 10.0', '< 11'`
	`36`	`+ \|`
`35`	`37`	`\|gem 'rspec-rails',`
`36`	`38`	`\| :path => '#{rspec_rails_repo_path}',`
`37`	`39`	`\| :groups => [:development, :test]`