summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorng <ng+gitlab@immerda.ch>2016-11-01 19:57:24 +0000
committerng <ng+gitlab@immerda.ch>2016-11-01 19:57:24 +0000
commitd4c87772bd31821c91f9ba149b5dc06959bc7155 (patch)
treedc2c0741b8cd8313a053fafb2f043577168dfc8e /lib
parent65066a585657ac58b3f7ed7e071ae5087abd0d9c (diff)
parent9cd565f00ae8f6e10ad96c7c8ab2aa65d8fabe8a (diff)
Merge branch 'fix_ci' into 'master'
Fix CI, dont install beaker on gitlab CI - Rename `system_tests` group to `acceptance` in Gemfile - Don't install `acceptance` group for rspec tests on CI - Use leapcode/ruby docker image because it has a more default ruby installation than the 'official' one. See merge request !52
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions