Always use sinatra from master until it is released

This should help avoid some confusion about the failing build
zzak · Jul 19, 2016 · 72291c6 · 72291c6
1 parent 9474e91
commit 72291c6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/sinatra-contrib/.travis.yml b/sinatra-contrib/.travis.yml
@@ -18,13 +18,11 @@ matrix:
     - { rvm: 2.3.1, env: tilt=master    }
     - { rvm: ruby-head, env: tilt=master    }
     - { rvm: 2.3.1, env: rack=master    }
-    - { rvm: 2.3.1, env: sinatra=master }
   allow_failures:
     - env: tilt=master
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: rbx
-    - env: sinatra=master
     - env: rack=master
 
 notifications:

diff --git a/sinatra-contrib/Gemfile b/sinatra-contrib/Gemfile
@@ -2,6 +2,7 @@ source "https://rubygems.org" unless ENV['QUICK']
 gemspec
 
 gem 'mustermann', github: 'sinatra/mustermann'
+gem 'sinatra', github: 'sinatra/sinatra'
 
 group :development, :test do