5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Merge branch 'master' into stable

Browse Source
This commit is contained in:
Greg Karékinian 2015-09-07 10:45:12 +02:00
commit 9c1e19deb3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,7 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- 1.9.3 - 2.2
- 2.1
before_install: before_install:
- sh .travis/install_riakcs.sh - sh .travis/install_riakcs.sh
before_script: before_script:

9
Gemfile.lock
View File

@ -22,6 +22,7 @@ GEM
backports (3.6.4) backports (3.6.4)
beefcake (0.3.7) beefcake (0.3.7)
builder (3.2.2) builder (3.2.2)
certifi (2015.08.10)
domain_name (0.5.24) domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
excon (0.16.10) excon (0.16.10)
@ -59,7 +60,7 @@ GEM
nokogiri (1.5.11) nokogiri (1.5.11)
purdytest (2.0.0) purdytest (2.0.0)
minitest (~> 5.5) minitest (~> 5.5)
rack (1.6.2) rack (1.6.4)
rack-protection (1.5.3) rack-protection (1.5.3)
rack rack
rack-test (0.6.3) rack-test (0.6.3)
@ -76,7 +77,8 @@ GEM
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
sentry-raven (0.13.3) sentry-raven (0.14.0)
certifi
faraday (>= 0.7.6) faraday (>= 0.7.6)
sinatra (1.4.6) sinatra (1.4.6)
rack (~> 1.4) rack (~> 1.4)
@ -118,3 +120,6 @@ DEPENDENCIES
sentry-raven sentry-raven
sinatra (~> 1.4) sinatra (~> 1.4)
sinatra-contrib sinatra-contrib
BUNDLED WITH
1.10.6