Merge branch 'master' into stable
This commit is contained in:
commit
62f7d8790a
@ -1,7 +1,9 @@
|
||||
language: ruby
|
||||
cache: bundler
|
||||
rvm:
|
||||
- 2.4.1
|
||||
- 2.4
|
||||
- 2.5
|
||||
- 2.6
|
||||
services:
|
||||
- redis-server
|
||||
before_script:
|
||||
|
22
Gemfile.lock
22
Gemfile.lock
@ -8,7 +8,7 @@ GEM
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.5.2)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
backports (3.11.2)
|
||||
backports (3.11.4)
|
||||
concurrent-ruby (1.0.5)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
@ -34,13 +34,13 @@ GEM
|
||||
minitest-stub_any_instance (1.0.2)
|
||||
multi_json (1.13.1)
|
||||
multipart-post (2.0.0)
|
||||
mustermann (1.0.2)
|
||||
mustermann (1.0.3)
|
||||
netrc (0.11.0)
|
||||
public_suffix (3.0.2)
|
||||
purdytest (2.0.0)
|
||||
minitest (~> 5.5)
|
||||
rack (2.0.4)
|
||||
rack-protection (2.0.1)
|
||||
rack (2.0.6)
|
||||
rack-protection (2.0.5)
|
||||
rack
|
||||
rack-test (1.0.0)
|
||||
rack (>= 1.0, < 3)
|
||||
@ -59,20 +59,20 @@ GEM
|
||||
safe_yaml (1.0.4)
|
||||
sentry-raven (2.7.2)
|
||||
faraday (>= 0.7.6, < 1.0)
|
||||
sinatra (2.0.1)
|
||||
sinatra (2.0.5)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.0)
|
||||
rack-protection (= 2.0.1)
|
||||
rack-protection (= 2.0.5)
|
||||
tilt (~> 2.0)
|
||||
sinatra-contrib (2.0.1)
|
||||
backports (>= 2.0)
|
||||
sinatra-contrib (2.0.5)
|
||||
backports (>= 2.8.2)
|
||||
multi_json
|
||||
mustermann (~> 1.0)
|
||||
rack-protection (= 2.0.1)
|
||||
sinatra (= 2.0.1)
|
||||
rack-protection (= 2.0.5)
|
||||
sinatra (= 2.0.5)
|
||||
tilt (>= 1.3, < 3)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.8)
|
||||
tilt (2.0.9)
|
||||
tzinfo (1.2.5)
|
||||
thread_safe (~> 0.1)
|
||||
unf (0.1.4)
|
||||
|
Loading…
x
Reference in New Issue
Block a user