Skip to content

Commit

Permalink
Merge pull request #13 from bootstrap-ruby/upgrade-sinatra-rack
Browse files Browse the repository at this point in the history
Basic upgrades
  • Loading branch information
pokle authored Dec 13, 2017
2 parents 072d967 + 706ef35 commit a11ba08
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
19 changes: 12 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
GEM
remote: https://rubygems.org/
specs:
rack (1.6.0)
rack-protection (1.5.3)
mustermann (1.0.1)
rack (2.0.3)
rack-protection (2.0.0)
rack
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
tilt (2.0.1)
sinatra (2.0.0)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.0)
tilt (~> 2.0)
tilt (2.0.8)

PLATFORMS
ruby

DEPENDENCIES
sinatra

BUNDLED WITH
1.16.0
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Hello!
====

This is a demonstrator for [Sinatra](http://www.sinatrarb.com/) and [Twitter Bootstrap](http://getbootstrap.com/).
This is a demonstrator for [Sinatra](http://www.sinatrarb.com/) and [Twitter Bootstrap](http://getbootstrap.com/).

Use it as a boilerplate to start your own apps.

Expand All @@ -11,12 +11,12 @@ Go!
Download and run sinatra-bootstrap:

git clone https://github.com/bootstrap-ruby/sinatra-bootstrap

cd sinatra-bootstrap
bundle install # To install sinatra

bundle exec ruby app.rb # To run the sample

Then open [http://localhost:4567/](http://localhost:4567/)

What's next?
Expand Down

0 comments on commit a11ba08

Please sign in to comment.