Download as
Browse Code »

Commit 7535aba75782b90bf4acce92263571c698706b0f

Authored by Evandro Junior
2 parents 6c8bd41f 72ed6347
Exists in staging and in 3 other branches captcha_serpro_plugin, production, production-vendorized

Merge branch 'travis' into staging 

* travis:
  Wont stop travis if Gemfile.lock does not exist
  - rm Gemfile.lock
  Removing Gemfile.lock
  will tell all the failing tests with rake test
  resending to test bugfix: force sprockets-rails to 2.3 version

Conflicts:
	.travis.yml
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
@@ -29,7 +29,7 @@ git: @@ -29,7 +29,7 @@ git:
29 29
30 # workaround for https://github.com/travis-ci/travis-ci/issues/4536 30 # workaround for https://github.com/travis-ci/travis-ci/issues/4536
31 before_install: 31 before_install:
32 - - rm Gemfile.lock 32 + - rm -f Gemfile.lock
33 - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0 33 - export GEM_HOME=$PWD/vendor/bundle/ruby/2.2.0
34 - gem install bundler 34 - gem install bundler
35 - sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules 35 - sed -i 's/softwarepublico.gov.br\/gitlab/github.com/' .gitmodules