Merge pull request #36 from bananaappletw/master

Remove Gemfile.lock
piotrmurach · Jan 28, 2019 · 3e24256 · 3e24256
2 parents 483737f + 306cb48
commit 3e24256
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 195 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+Gemfile.lock
 gemfiles/*.lock
 InstalledFiles
 _yardoc

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,11 @@
 language: ruby
 cache: bundler
 sudo: false
-before_install: "gem update bundler"
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+  - bundle -v
+  - echo $TRAVIS_RUBY_VERSION
 script: "bundle exec rake ci"
 rvm:
   - 2.1.10

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/loaf.gemspec b/loaf.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rails', '>= 3.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '>= 1.5'
   spec.add_development_dependency 'rake'
 end