Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging

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