Merge branch 'release/0.35.0.0'

.gitignore

@@ -28,6 +28,7 @@ locale/model_attributes.rb
 log/*
 old-cache/
 public/*theme/
+public/alavetelitheme
 public/asktheeu-theme
 public/assets/
 public/down.current.html

.ruby-style.yml

@@ -13,6 +13,7 @@ AllCops:
     - '**/Rakefile'
     - '**/Vagrantfile'
   Exclude:
+    - 'commonlib/**/*'
     - 'db/schema.rb'
     - 'node_modules/**/*'
     - 'vendor/**/*'
@@ -112,20 +113,22 @@ Layout/EndOfLine:
 
 Layout/ExtraSpacing:
   Description: 'Do not use unnecessary spacing.'
-  Enabled: false
+  Enabled: true
 
 Layout/InitialIndentation:
   Description: >-
     Checks the indentation of the first non-blank non-comment line in a file.
-  Enabled: false
+  Enabled: true
 
 Layout/FirstParameterIndentation:
   Description: 'Checks the indentation of the first parameter in a method call.'
-  Enabled: false
+  Enabled: true
 
 Layout/IndentationConsistency:
   Description: 'Keep indentation straight.'
-  Enabled: false
+  Enabled: true
+  Exclude:
+    - Gemfile
 
 Layout/IndentationWidth:
   Description: 'Use 2 spaces for indentation.'
@@ -142,7 +145,7 @@ Layout/IndentAssignment:
   Description: >-
                  Checks the indentation of the first line of the
                  right-hand-side of a multi-line assignment.
-  Enabled: false
+  Enabled: true
 
 Layout/IndentHash:
   Description: 'Checks the indentation of the first key in a hash literal.'
@@ -158,7 +161,7 @@ Layout/MultilineArrayBraceLayout:
                  Checks that the closing brace in an array literal is
                  either on the same line as the last array element, or
                  a new line.
-  Enabled: false
+  Enabled: true
 
 Layout/MultilineBlockLayout:
   Description: 'Ensures newlines after multiline block do statements.'
@@ -177,7 +180,7 @@ Layout/MultilineMethodCallBraceLayout:
                  Checks that the closing brace in a method call is
                  either on the same line as the last method argument, or
                  a new line.
-  Enabled: false
+  Enabled: true
 
 Layout/MultilineMethodCallIndentation:
   Description: >-
@@ -190,13 +193,13 @@ Layout/MultilineMethodDefinitionBraceLayout:
                  Checks that the closing brace in a method definition is
                  either on the same line as the last method parameter, or
                  a new line.
-  Enabled: false
+  Enabled: true
 
 Layout/MultilineOperationIndentation:
   Description: >-
                  Checks indentation of binary operations that span more than
                  one line.
-  Enabled: false
+  Enabled: true
 
 Layout/RescueEnsureAlignment:
   Description: 'Align rescues and ensures correctly.'
@@ -206,7 +209,7 @@ Layout/SpaceBeforeFirstArg:
   Description: >-
                  Checks that exactly one space is used between a method name
                  and the first argument for method calls without parentheses.
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAfterColon:
   Description: 'Use spaces after colons.'
@@ -239,7 +242,7 @@ Layout/SpaceBeforeBlockBraces:
   Description: >-
                  Checks that the left block brace has or doesn't have space
                  before it.
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceBeforeComma:
   Description: 'No spaces before commas.'
@@ -253,47 +256,47 @@ Layout/SpaceBeforeComment:
 
 Layout/SpaceBeforeSemicolon:
   Description: 'No spaces before semicolons.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsideBlockBraces:
   Description: >-
                  Checks that block braces have or don't have surrounding space.
                  For blocks taking parameters, checks that the left brace has
                  or doesn't have trailing space.
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAroundBlockParameters:
   Description: 'Checks the spacing inside and after block parameters pipes.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAroundEqualsInParameterDefault:
   Description: >-
                  Checks that the equals signs in parameter default assignments
                  have or don't have surrounding space depending on
                  configuration.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-around-equals'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAroundKeyword:
   Description: 'Use a space around keywords if appropriate.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAroundOperators:
   Description: 'Use a single space around operators.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsideArrayPercentLiteral:
   Description: 'No unnecessary additional spaces between elements in %i/%w literals.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsidePercentLiteralDelimiters:
   Description: 'No unnecessary spaces inside delimiters of %i/%w/%x literals.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsideArrayLiteralBrackets:
   Description: 'Checks the spacing inside array literal brackets.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceInsideReferenceBrackets:
   Description: 'Checks the spacing inside referential brackets.'
@@ -562,6 +565,8 @@ Style/HashSyntax:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals'
   Enabled: true
   EnforcedStyle: ruby19_no_mixed_keys
+  Exclude:
+    - config/routes.rb
 
 Style/IfInsideElse:
   Description: 'Finds if nodes inside else, which can be converted to elsif.'

.travis.yml

@@ -18,7 +18,6 @@ gemfile:
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: 2.6
     - rvm: ruby-head
     - gemfile: Gemfile.rails_next
 services:

Gemfile

@@ -97,7 +97,6 @@ gem 'dalli', '~> 2.7.0'
 gem 'dynamic_form', '~> 1.1.0'
 gem 'exception_notification', ['~> 4.1.0', '< 4.1.2']
 gem 'fancybox-rails', '~> 0.3.0'
-gem 'geoip', '~> 1.6.4'
 gem 'gnuplot', '~> 2.6.0'
 gem 'htmlentities', '~> 4.3.0'
 gem 'icalendar', '~> 2.4.0'
@@ -107,9 +106,10 @@ gem 'json', ['~> 1.8.0', '< 2.0.0']
 gem 'holidays', '~> 4.7.0', '< 5.0.0'
 gem 'iso_country_codes', '~> 0.7.8'
 gem 'mail', '~> 2.6.6'
+gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.4'
 gem 'newrelic_rpm'
-gem 'nokogiri', '~> 1.10.3'
+gem 'nokogiri', '~> 1.10.4'
 gem 'open4', '~> 1.3.0'
 gem 'rack', '~> 2.0.0'
 gem 'rack-ssl', '~> 1.4.0'
@@ -122,7 +122,7 @@ gem 'rubyzip', '~> 1.2.2'
 gem 'secure_headers', '~> 3.6.0'
 gem 'statistics2', '~> 0.54'
 gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :ref => 'c1c14da'
-gem 'stripe', '~> 3.4.1'
+gem 'stripe', '~> 3.29.0'
 gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.5.0', '< 1.6.0'
 gem 'vpim', '~> 13.11.11'
@@ -166,7 +166,7 @@ group :test do
   gem 'coveralls', '~> 0.8.0', :require => false
   gem 'capybara', '~> 3.5.0'
   gem 'delorean', '~> 2.1.0'
-  gem 'stripe-ruby-mock', '~> 2.5.4'
+  gem 'stripe-ruby-mock', ['~> 2.5.4', '< 2.5.7']
   gem('rails-controller-testing')
 end
 

Gemfile.lock

@@ -169,7 +169,7 @@ GEM
       railties (>= 3.0.0)
     fancybox-rails (0.3.1)
       railties (>= 3.1.0)
-    faraday (0.15.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     fast_gettext (1.1.2)
     ffi (1.9.25)
@@ -183,7 +183,6 @@ GEM
       rack (>= 1.4, < 3)
       rack-protection (>= 1.5.3, < 2.1.0)
     gender_detector (1.0.0)
-    geoip (1.6.4)
     gettext (2.3.9)
       locale
       text
@@ -226,6 +225,7 @@ GEM
     mahoro (0.4)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
+    maxmind-db (1.0.0)
     method_source (0.9.2)
     mime-types (2.99.3)
     mini_mime (1.0.1)
@@ -244,7 +244,7 @@ GEM
       net-ssh (>= 2.6.5)
     newrelic_rpm (6.4.0.356)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oink (0.10.1)
       activerecord
@@ -372,9 +372,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     statistics2 (0.54)
-    stripe (3.4.1)
+    stripe (3.29.0)
       faraday (~> 0.10)
-    stripe-ruby-mock (2.5.5)
+    stripe-ruby-mock (2.5.6)
       dante (>= 0.2.0)
       multi_json (~> 1.0)
       stripe (>= 2.0.3)
@@ -448,7 +448,6 @@ DEPENDENCIES
   fast_gettext (< 1.2.0)
   flipper-ui (~> 0.10.2)
   gender_detector (~> 1.0.0)
-  geoip (~> 1.6.4)
   gettext (~> 2.3.0)
   gettext_i18n_rails (~> 0.10.1)
   globalize (~> 5.1.0)
@@ -466,12 +465,13 @@ DEPENDENCIES
   locale (~> 2.0.0, < 2.1.0)
   mahoro (~> 0.4)
   mail (~> 2.6.6)
+  maxmind-db (~> 1.0.0)
   mime-types (< 3.0.0)
   money (~> 6.13.2)
   net-ssh (~> 2.9.0, < 3.0.0)
   net-ssh-gateway (>= 1.1.0, < 2.0.0)
   newrelic_rpm
-  nokogiri (~> 1.10.3)
+  nokogiri (~> 1.10.4)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
   pg (~> 0.20.0)
@@ -497,8 +497,8 @@ DEPENDENCIES
   secure_headers (~> 3.6.0)
   statistics2 (~> 0.54)
   strip_attributes!
-  stripe (~> 3.4.1)
-  stripe-ruby-mock (~> 2.5.4)
+  stripe (~> 3.29.0)
+  stripe-ruby-mock (~> 2.5.4, < 2.5.7)
   syslog_protocol (~> 0.9.0)
   therubyracer (~> 0.12.0)
   thin (~> 1.5.0, < 1.6.0)

Gemfile.rails_next.lock

@@ -169,7 +169,7 @@ GEM
       railties (>= 3.0.0)
     fancybox-rails (0.3.1)
       railties (>= 3.1.0)
-    faraday (0.15.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     fast_gettext (1.1.2)
     ffi (1.9.25)
@@ -183,7 +183,6 @@ GEM
       rack (>= 1.4, < 3)
       rack-protection (>= 1.5.3, < 2.1.0)
     gender_detector (1.0.0)
-    geoip (1.6.4)
     gettext (2.3.9)
       locale
       text
@@ -226,6 +225,7 @@ GEM
     mahoro (0.4)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
+    maxmind-db (1.0.0)
     method_source (0.9.2)
     mime-types (2.99.3)
     mini_mime (1.0.1)
@@ -244,7 +244,7 @@ GEM
       net-ssh (>= 2.6.5)
     newrelic_rpm (6.4.0.356)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oink (0.10.1)
       activerecord
@@ -372,9 +372,9 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     statistics2 (0.54)
-    stripe (3.4.1)
+    stripe (3.29.0)
       faraday (~> 0.10)
-    stripe-ruby-mock (2.5.5)
+    stripe-ruby-mock (2.5.6)
       dante (>= 0.2.0)
       multi_json (~> 1.0)
       stripe (>= 2.0.3)
@@ -448,7 +448,6 @@ DEPENDENCIES
   fast_gettext (< 1.2.0)
   flipper-ui (~> 0.10.2)
   gender_detector (~> 1.0.0)
-  geoip (~> 1.6.4)
   gettext (~> 2.3.0)
   gettext_i18n_rails (~> 0.10.1)
   globalize (~> 5.1.0)
@@ -466,12 +465,13 @@ DEPENDENCIES
   locale (~> 2.0.0, < 2.1.0)
   mahoro (~> 0.4)
   mail (~> 2.6.6)
+  maxmind-db (~> 1.0.0)
   mime-types (< 3.0.0)
   money (~> 6.13.2)
   net-ssh (~> 2.9.0, < 3.0.0)
   net-ssh-gateway (>= 1.1.0, < 2.0.0)
   newrelic_rpm
-  nokogiri (~> 1.10.3)
+  nokogiri (~> 1.10.4)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
   pg (~> 0.20.0)
@@ -497,8 +497,8 @@ DEPENDENCIES
   secure_headers (~> 3.6.0)
   statistics2 (~> 0.54)
   strip_attributes!
-  stripe (~> 3.4.1)
-  stripe-ruby-mock (~> 2.5.4)
+  stripe (~> 3.29.0)
+  stripe-ruby-mock (~> 2.5.4, < 2.5.7)
   syslog_protocol (~> 0.9.0)
   therubyracer (~> 0.12.0)
   thin (~> 1.5.0, < 1.6.0)

README.md

@@ -38,6 +38,7 @@ Every Alaveteli commit is tested by Travis on the [following Ruby platforms](htt
 * ruby-2.3.0
 * ruby-2.4.0
 * ruby-2.5.0
+* ruby-2.6.0
 
 If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the alaveteli team (currently 2.3.8), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory.