Merge pull request 18F#260 from jessieay/jy-sinatr

Update Sinatra gem version

Gemfile

@@ -55,7 +55,7 @@ group :test do
   gem "database_cleaner"
   gem "shoulda-matchers"
   gem "simplecov", require: false
-  gem "sinatra", github: "sinatra/sinatra" # https://github.com/sinatra/sinatra/issues/1135
+  gem "sinatra"
   gem "timecop"
   gem "webmock"
 end

Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/sinatra/sinatra.git
-  revision: a5da6fa82c46436f59ae482d07c1752ab908c852
-  specs:
-    sinatra (2.0.0.pre.alpha)
-      mustermann (~> 0.4)
-      rack (~> 2.0)
-      rack-protection (~> 1.5)
-      tilt (~> 2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -153,8 +143,7 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mustermann (0.4.0)
-      tool (~> 0.2)
+    mustermann (1.0.2)
     neat (1.8.0)
       sass (>= 3.3)
       thor (~> 0.19)
@@ -200,7 +189,7 @@ GEM
     rack-canonical-host (0.2.2)
       addressable (> 0, < 3)
       rack (>= 1.0.0, < 3)
-    rack-protection (1.5.3)
+    rack-protection (2.0.1)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -279,6 +268,11 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     slack-ruby-client (0.7.9)
       activesupport
       faraday (>= 0.9)
@@ -310,7 +304,6 @@ GEM
     title (0.0.7)
       i18n
       rails (>= 3.1)
-    tool (0.2.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (3.1.6)
@@ -371,7 +364,7 @@ DEPENDENCIES
   shoulda-matchers
   simple_form
   simplecov
-  sinatra!
+  sinatra
   slack-ruby-client
   spring
   spring-commands-rspec
@@ -386,4 +379,4 @@ RUBY VERSION
    ruby 2.3.5p376
 
 BUNDLED WITH
-   1.15.4
+   1.16.1