Merge branch 'release/0.30.0.0'

.gitignore

@@ -1,5 +1,6 @@
 /tmp
-/log
+/log/*
+!/log/.keep
 /coverage
 /sqlitedbs
 /cache
@@ -12,6 +13,7 @@
 .ruby-version
 .rbenv-version
 .rvmrc
+.vagrant.yml
 *#*#
 TAGS
 /lib/themes
@@ -34,3 +36,4 @@ webrat.log
 /db/structure.sql
 /public/assets
 .vagrant
+.overcommit.yml

.ruby-style.yml

@@ -18,8 +18,6 @@ AllCops:
   Exclude:
   - "vendor/**/*"
   - "db/schema.rb"
-  Rails:
-    Enabled: false
   DisplayCopNames: false
   StyleGuideCopsOnly: false
   DisabledByDefault: true
@@ -34,20 +32,20 @@ Layout/AlignArray:
                  Align the elements of an array literal if they span more than
                  one line.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays'
-  Enabled: false
+  Enabled: true
 
 Layout/AlignHash:
   Description: >-
                  Align the elements of a hash literal if they span more than
                  one line.
-  Enabled: false
+  Enabled: true
 
 Layout/AlignParameters:
   Description: >-
                  Align the parameters of a method call if they span more
                  than one line.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
-  Enabled: false
+  Enabled: true
 
 Layout/BlockEndNewline:
   Description: 'Put end statement of multiline block on its own line.'
@@ -60,11 +58,11 @@ Layout/CaseIndentation:
 
 Layout/ClosingParenthesisIndentation:
   Description: 'Checks the indentation of hanging closing parentheses.'
-  Enabled: false
+  Enabled: true
 
 Layout/CommentIndentation:
   Description: 'Indentation of comments.'
-  Enabled: false
+  Enabled: true
 
 Layout/DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
@@ -73,7 +71,7 @@ Layout/DotPosition:
 
 Layout/ElseAlignment:
   Description: 'Align elses and elsifs correctly.'
-  Enabled: false
+  Enabled: true
 
 Layout/EmptyLineBetweenDefs:
   Description: 'Use empty lines between defs.'
@@ -86,7 +84,7 @@ Layout/EmptyLines:
 
 Layout/EmptyLinesAroundAccessModifier:
   Description: "Keep blank lines around access modifiers."
-  Enabled: false
+  Enabled: true
 
 Layout/EmptyLinesAroundBlockBody:
   Description: "Keeps track of empty lines around block bodies."
@@ -150,7 +148,7 @@ Layout/IndentHash:
 Layout/LeadingCommentSpace:
   Description: 'Comments should start with a space.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space'
-  Enabled: false
+  Enabled: true
 
 Layout/MultilineArrayBraceLayout:
   Description: >-
@@ -161,7 +159,7 @@ Layout/MultilineArrayBraceLayout:
 
 Layout/MultilineBlockLayout:
   Description: 'Ensures newlines after multiline block do statements.'
-  Enabled: false
+  Enabled: true
 
 Layout/MultilineHashBraceLayout:
   Description: >-
@@ -198,7 +196,7 @@ Layout/MultilineOperationIndentation:
 
 Layout/RescueEnsureAlignment:
   Description: 'Align rescues and ensures correctly.'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceBeforeFirstArg:
   Description: >-
@@ -209,29 +207,29 @@ Layout/SpaceBeforeFirstArg:
 Layout/SpaceAfterColon:
   Description: 'Use spaces after colons.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAfterComma:
   Description: 'Use spaces after commas.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAfterMethodName:
   Description: >-
                  Do not put a space between a method name and the opening
                  parenthesis in a method definition.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAfterNot:
   Description: Tracks redundant space after the ! operator.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-bang'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceAfterSemicolon:
   Description: 'Use spaces after semicolons.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
-  Enabled: false
+  Enabled: true
 
 Layout/SpaceBeforeBlockBraces:
   Description: >-
@@ -989,6 +987,24 @@ Metrics/LineLength:
   Description: 'Limit lines to 80 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
   Enabled: true
+  Max: 80
+  # To make it possible to copy or click on URIs in the code, we allow lines
+  # containing a URI to be longer than Max.
+  AllowHeredoc: true
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+  # The IgnoreCopDirectives option causes the LineLength rule to ignore cop
+  # directives like '# rubocop: enable ...' when calculating a line's length.
+  IgnoreCopDirectives: false
+  # The IgnoredPatterns option is a list of !ruby/regexp and/or string
+  # elements. Strings will be converted to Regexp objects. A line that matches
+  # any regular expression listed in this option will be ignored by LineLength.
+  IgnoredPatterns:
+    - '^\s*it\s+.*do$'
+    - '^\s*context\s+.*do$'
+    - '^\s*describe\s+.*do$'
 
 Metrics/MethodLength:
   Description: 'Avoid methods longer than 10 lines of code.'
@@ -1238,7 +1254,7 @@ Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: false
 
-Lint/UselessArraySplat:
+Lint/UnneededSplatExpansion:
   Description: 'Checks for useless array splats.'
   Enabled: false
 
@@ -1341,10 +1357,6 @@ Performance/LstripRstrip:
   Description: 'Use `strip` instead of `lstrip.rstrip`.'
   Enabled: false
 
-Performance/PushSplat:
-  Description: 'Use `concat` instead of `push(*)`.'
-  Enabled: false
-
 Performance/RangeInclude:
   Description: 'Use `Range#cover?` instead of `Range#include?`.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#cover-vs-include-code'

.vagrant.yml.example

@@ -0,0 +1,8 @@
+fqdn: alaveteli.10.10.10.30.xip.io
+ip: 10.10.10.30
+memory: 1536
+themes_dir: ../alaveteli-themes
+os: wheezy64
+use_nfs: false
+show_settings: false
+cpus: 2 # By default this is calculated dynamically

Gemfile

@@ -79,7 +79,7 @@
 # the new version. It is always preferable to upgrade our code.
 source 'https://rubygems.org'
 
-gem 'rails', '4.1.16'
+gem 'rails', '4.2.9'
 
 gem 'pg', '~> 0.18.0', '< 0.19.0'
 
@@ -90,7 +90,7 @@ gem 'cancancan', '~> 1.12.0', '< 1.13.0'
 gem 'charlock_holmes', '~> 0.7.0'
 gem 'dalli', '~> 2.7.0'
 gem 'dynamic_form', '~> 1.1.0'
-gem 'exception_notification', '~> 4.0.0', '< 4.1.0'
+gem 'exception_notification', '~> 4.1.0', '< 4.1.2'
 gem 'fancybox-rails', '~> 0.3.0'
 gem 'foundation-rails', '~> 5.5.3.2'
 gem 'geoip', '~> 1.6.0'
@@ -108,7 +108,7 @@ gem 'net-http-local', '~> 0.1.0', :platforms => [:ruby_19]
 gem 'net-purge', '~> 0.1.0'
 gem 'nokogiri', '~> 1.6.0', '< 1.7'
 gem 'open4', '~> 1.3.0'
-gem 'rack', '~> 1.5.0', '< 1.6.0'
+gem 'rack', '~> 1.6.0'
 gem 'rack-ssl', '~> 1.4.0'
 gem 'rack-utf8_sanitizer', '~> 1.3.0'
 gem 'rails-i18n', '~> 4.0.0', '< 5.0.0'
@@ -135,14 +135,14 @@ gem 'gender_detector', '~> 1.0.0'
 gem 'gettext_i18n_rails', '~> 0.9.0', '< 1.0.0'
   gem 'fast_gettext', '< 1.2.0'
 gem 'gettext', '~> 2.3.0'
-gem 'globalize', '~> 4.0.0', '< 5.0.0'
+gem 'globalize', '~> 5.0.0', '< 5.1.0'
 gem 'locale', '~> 2.0.0', '< 2.1.0'
-gem 'routing-filter', '~> 0.4.0', '< 0.5.0'
+gem 'routing-filter', '~> 0.5.0', '< 0.6.0'
 gem 'unicode', '~> 0.4.0'
 gem 'unidecoder', '~> 1.1.0'
 
 # mime-types 3.0.0 requires Ruby 2.0.0, and _something_ is trying to update it
-gem 'mime-types', '< 3.0.0'
+gem 'mime-types', '< 3.0.0', require: false
 
 # Assets
 gem 'bootstrap-sass', '~> 2.3.2.2'
@@ -160,13 +160,15 @@ group :test do
   gem 'coveralls', '~> 0.8.0', :require => false
     gem 'tins', '~> 1.3.0', '< 1.3.1'
     gem 'term-ansicolor', '~> 1.3.0', '< 1.4'
-  gem 'capybara', '~> 2.13.0'
+  gem 'capybara', '~> 2.15.0'
   gem 'delorean', '~> 2.1.0'
+  gem 'test_after_commit', '~> 0.4.2'
 end
 
 group :test, :development do
   gem 'bullet', '~> 5.5.0'
   gem 'factory_girl_rails', '~> 4.8.0'
+  gem 'oink', '~> 0.10.1'
   gem 'rspec-activemodel-mocks', '~> 1.0.0'
   gem 'rspec-rails', '~> 3.5.0'
   gem 'pry', '~> 0.10.0'
@@ -181,6 +183,7 @@ group :development do
   gem 'mailcatcher', '~> 0.6.0'
   gem 'quiet_assets', '~> 1.1.0'
   gem 'launchy', '~> 2.4.0'
-  gem 'spring', '~> 1.7.0', '< 2.0.0'
+  gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.0'
+  gem 'web-console', '~> 2.3.0', '< 3.0.0'
 end