Merge branch 'sh-bump-better-errors-gem' into 'master'

Upgrade better_errors gem to 2.5.0

See merge request gitlab-org/gitlab-ce!23312

Gemfile

@@ -320,7 +320,7 @@ group :development do
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
   # Better errors handler
-  gem 'better_errors', '~> 2.1.0'
+  gem 'better_errors', '~> 2.5.0'
   gem 'binding_of_caller', '~> 0.8.0'
   # thin instead webrick

Gemfile.lock

@@ -77,9 +77,9 @@ GEM
     bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
-    better_errors (2.1.1)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.3)
     binding_of_caller (0.8.0)
@@ -181,6 +181,7 @@ GEM
       mail (~> 2.7)
     encryptor (3.0.0)
     equalizer (0.0.11)
+    erubi (1.7.1)
     erubis (2.7.0)
     escape_utils (1.2.1)
     et-orbi (1.0.3)
@@ -952,7 +953,7 @@ DEPENDENCIES
   batch-loader (~> 1.2.1)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
-  better_errors (~> 2.1.0)
+  better_errors (~> 2.5.0)
   binding_of_caller (~> 0.8.0)
   bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)

Gemfile.rails4.lock

@@ -74,9 +74,9 @@ GEM
     bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
-    better_errors (2.1.1)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.3)
     binding_of_caller (0.8.0)
@@ -180,6 +180,7 @@ GEM
       mail (~> 2.7)
     encryptor (3.0.0)
     equalizer (0.0.11)
+    erubi (1.7.1)
     erubis (2.7.0)
     escape_utils (1.2.1)
     et-orbi (1.0.3)
@@ -943,7 +944,7 @@ DEPENDENCIES
   batch-loader (~> 1.2.1)
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
-  better_errors (~> 2.1.0)
+  better_errors (~> 2.5.0)
   binding_of_caller (~> 0.8.0)
   bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)