From 4d4b832eb0e034d11da7801db0f53c9b083b1486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 13 Jun 2017 13:03:33 +0200
Subject: [PATCH] Bump omniauth to silence hashie warning

Fixes hashie warnings of the kind

```
You are setting a key that conflicts with a built-in method Foo#bar.
```

Warnings have been silenced in:
https://github.com/omniauth/omniauth/pull/874

Since our PR (https://github.com/omniauth/omniauth/pull/837) has not
been answered, we maintain our own fork.
---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 57fd510ff0..459689aae3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee
 gem 'rdoc', '>= 2.4.2'
 
 gem 'globalize', git: 'https://github.com/globalize/globalize', ref: '38443bcd', require: false
-gem 'omniauth', git: 'https://github.com/oliverguenther/omniauth', ref: '8385bc0'
+gem 'omniauth', git: 'https://github.com/oliverguenther/omniauth', ref: '40c6f5f751d2da7cce5444bbd96c390c450440a9'
 gem 'request_store', '~> 1.3.1'
 gem 'gravatar_image_tag', '~> 1.2.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index be0efe9b33..a60536de79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,12 +51,12 @@ GIT
 
 GIT
   remote: https://github.com/oliverguenther/omniauth
-  revision: 8385bc0da47e4fc4f4a256c97725bcf8215d13c2
-  ref: 8385bc0
+  revision: 40c6f5f751d2da7cce5444bbd96c390c450440a9
+  ref: 40c6f5f751d2da7cce5444bbd96c390c450440a9
   specs:
-    omniauth (1.3.1)
-      hashie (>= 1.2, < 4)
-      rack (>= 1.0, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
 
 GIT
   remote: https://github.com/opf/openproject-translations.git