From 7880d6fb0a40608ea667d0093d34af4c34dad7c4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 8 Dec 2019 18:54:44 +0200 Subject: [PATCH] Upgrade to Bundler 2 Closes #1078 --- .travis.yml | 2 -- Gemfile | 7 ------- Gemfile.lock | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcb988d67..24918ddbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ before_install: - "sudo mv -f ~/chromedriver /usr/local/share/" - "sudo chmod +x /usr/local/share/chromedriver" - "sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver" - - "gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true" - - "gem install bundler -v '< 2'" before_script: - "cp config/application.yml.sample config/application.yml" - "cp config/database_travis.yml config/database.yml" diff --git a/Gemfile b/Gemfile index 5497cb79f..26294b04e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,3 @@ -# Use https only for accessing github -# https://github.com/bundler/bundler/pull/3447 -git_source(:github) do |repo_name| - repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") - "https://github.com/#{repo_name}.git" -end if Bundler::VERSION < '2' - source 'https://rubygems.org' # core diff --git a/Gemfile.lock b/Gemfile.lock index 9027ccd5d..e9f389538 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -500,4 +500,4 @@ DEPENDENCIES wkhtmltopdf-binary BUNDLED WITH - 1.17.3 + 2.0.2