Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sinatra to 2.0.5 #81

Merged
merged 2 commits into from Jan 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -5,8 +5,7 @@ env:
- CC_TEST_REPORTER_ID=22697375d978d2b0cea8ef21c3102d24df2d12ed3ce495fd9aa26bfd9be80241

rvm:
- "2.2.2"
- "2.4.2"
- "2.3.0"
- "2.5.0"

addons:
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Expand Up @@ -8,9 +8,7 @@ group :development do
# CmomonMarker (it requires a lower version than we need)
# gem 'github-pages', group: :jekyll_plugins


gem 'byebug'
gem 'github_changelog_generator'
gem 'rack-test'
gem 'rdoc'
gem 'rspec'
Expand Down
10 changes: 4 additions & 6 deletions madness.gemspec
Expand Up @@ -15,11 +15,8 @@ Gem::Specification.new do |s|
s.executables = ["madness"]
s.homepage = 'https://github.com/DannyBen/madness'
s.license = 'MIT'
s.required_ruby_version = ">= 2.2.2"
s.required_ruby_version = ">= 2.3.0"

# we are locking sinatra to 2.0.3 due to this issue:
# https://github.com/sinatra/sinatra/issues/1476
s.add_runtime_dependency 'sinatra', '2.0.3'
s.add_runtime_dependency 'coderay', '~> 1.1'
s.add_runtime_dependency 'colsole', '~> 0.5'
s.add_runtime_dependency 'commonmarker', '~> 0.18'
Expand All @@ -29,9 +26,10 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'naturally', '~> 2.1'
s.add_runtime_dependency 'puma', '~> 3.11'
s.add_runtime_dependency 'rack-contrib', '~> 2.0'
s.add_runtime_dependency 'rack-ssl', '~> 1.4'
s.add_runtime_dependency 'requires', '~> 0.1'
s.add_runtime_dependency 'sass', '~> 3.4'
s.add_runtime_dependency 'sinatra-contrib', '~> 2.0'
s.add_runtime_dependency 'sinatra', '~> 2.0', '>= 2.0.5'
s.add_runtime_dependency 'sinatra-contrib', '~> 2.0', '>= 2.0.5'
s.add_runtime_dependency 'slim', '~> 4.0'
s.add_runtime_dependency 'rack-ssl', '~> 1.4'
end