summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-12-08 16:38:33 +0100
committerAzul <azul@riseup.net>2017-12-08 16:38:33 +0100
commiteb4def2f57242047c6fff1bf18ffdb254b010976 (patch)
tree42b18bc120d09347899cfe7860f3253d78fc4065
parentff8b2635c308d45ec38fd4eed257db7da9b3c4b0 (diff)
upgrade: drop ruby 2.1 requirementdrop/ruby-2.1
-rw-r--r--.gitlab-ci.yml11
-rw-r--r--.ruby-version2
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock27
4 files changed, 19 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85ada41..aa0c4a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,3 @@
-ruby2-1:
- image: "ruby:2.1"
- script:
- - bundle exec rake test
- artifacts:
- when: on_failure
- paths:
- - log/test.log
- - tmp/*.log
- - tmp/*.png
-
ruby2-3:
image: "ruby:2.3"
script:
diff --git a/.ruby-version b/.ruby-version
index 54b50ff..0ba9f86 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1,2 +1,2 @@
-2.1.5
+2.3.3
diff --git a/Gemfile b/Gemfile
index 3199e0a..48c1ef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
## CORE
# rake 11.x throws lots of warnings about rails 3.2 code
gem "rake"
-gem "rails", "~> 4.2.7"
+gem "rails", "~> 4.2.10"
# TODO: drop this and the respond_with usage
gem 'responders', '~> 2.0'
gem "couchrest", "~> 2.0.0.rc3"
@@ -75,7 +75,6 @@ group :test do
# we use cucumber to document and test the api
gem 'cucumber-rails', require: false
- gem 'cucumber', '~> 2.4.0' # version that still supports ruby 2.1
end
group :test, :development do
@@ -93,8 +92,7 @@ group :development do
end
group :test, :debug do
- # bundler on jessie doesn't support `:platforms => :ruby_21`
- gem 'byebug', '~> 9.0.6'
+ gem 'byebug'
end
##
diff --git a/Gemfile.lock b/Gemfile.lock
index 430155b..19034cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,6 +65,7 @@ GEM
arel (6.0.4)
autoprefixer-rails (7.2.2)
execjs
+ backports (3.10.3)
binding_of_caller (0.7.3)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.7)
@@ -74,7 +75,7 @@ GEM
builder (>= 2.0.0)
buftok (0.2.0)
builder (3.2.3)
- byebug (9.0.6)
+ byebug (9.1.0)
capybara (2.16.1)
addressable
mini_mime (>= 0.1.3)
@@ -105,22 +106,27 @@ GEM
couchrest (~> 2.0.0.rc3)
couchrest_model (~> 2.1.0.beta2)
crass (1.0.3)
- cucumber (2.4.0)
+ cucumber (3.1.0)
builder (>= 2.1.2)
- cucumber-core (~> 1.5.0)
+ cucumber-core (~> 3.1.0)
+ cucumber-expressions (~> 5.0.4)
cucumber-wire (~> 0.0.1)
- diff-lcs (>= 1.1.3)
- gherkin (~> 4.0)
+ diff-lcs (~> 1.3)
+ gherkin (~> 5.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
- cucumber-core (1.5.0)
- gherkin (~> 4.0)
+ cucumber-core (3.1.0)
+ backports (>= 3.8.0)
+ cucumber-tag_expressions (~> 1.1.0)
+ gherkin (>= 5.0.0)
+ cucumber-expressions (5.0.7)
cucumber-rails (1.5.0)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 4)
mime-types (>= 1.17, < 4)
nokogiri (~> 1.5)
railties (>= 4, < 5.2)
+ cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
debug_inspector (0.0.3)
diff-lcs (1.3)
@@ -142,7 +148,7 @@ GEM
faker (1.8.5)
i18n (~> 0.9.1)
ffi (1.9.18)
- gherkin (4.1.3)
+ gherkin (5.0.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
haml (5.0.4)
@@ -348,7 +354,7 @@ DEPENDENCIES
SyslogLogger (~> 2.0)
binding_of_caller
bootstrap-sass
- byebug (~> 9.0.6)
+ byebug
capybara
certificate_authority!
client_side_validations
@@ -357,7 +363,6 @@ DEPENDENCIES
couchrest (~> 2.0.0.rc3)
couchrest_model (~> 2.1.0.beta2)
couchrest_session_store (~> 0.4.2)
- cucumber (~> 2.4.0)
cucumber-rails
factory_girl_rails
fake_braintree
@@ -376,7 +381,7 @@ DEPENDENCIES
poltergeist
pry
psych (~> 2.2.4)
- rails (~> 4.2.7)
+ rails (~> 4.2.10)
rails-i18n
rails_warden
rake