summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-07-24 05:22:44 +0000
committerazul <azul@riseup.net>2017-07-24 05:22:44 +0000
commit8c998a12187bebe744a29092ca65d65b1f390529 (patch)
tree5c3d3a139d9947687481b9ac0aaa1b6ef4ce4b94
parentcdad3bedd7d90957d836d9d9c339e6b9dfc8b8d1 (diff)
parentdb223591e77b94ee6a1f94281626c12e2f51d436 (diff)
Merge branch 'upgrade/bundle' into 'master'
Upgrade/bundle See merge request !12
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--Gemfile.lock6
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 806f2c1..84d38d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,5 +26,13 @@ before_script:
- apt install -y lsof
test:
+ stage: test
script:
- TEST_OPTS=-v bundle exec rake test
+
+bundle_audit:
+ stage: test
+ script: |
+ gem install bundler-audit
+ bundle-audit update
+ bundle-audit check
diff --git a/Gemfile.lock b/Gemfile.lock
index a95c620..4e934ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
timers (>= 4.1.1)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
- hitimes (1.2.4)
+ hitimes (1.2.5)
http (2.2.2)
addressable (~> 2.3)
http-cookie (~> 1.0)
@@ -43,7 +43,7 @@ GEM
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- http-form_data (1.0.2)
+ http-form_data (1.0.3)
http_parser.rb (0.6.0)
minitest (5.10.2)
nio4r (1.2.1)
@@ -74,4 +74,4 @@ DEPENDENCIES
rake
BUNDLED WITH
- 1.14.6
+ 1.15.2