summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-27 11:02:34 +0000
committerRémy Coutable <remy@rymai.me>2017-02-27 11:02:34 +0000
commitc72c8e9a0effb2947c47977c2bb686578193aaba (patch)
treeeb55addb2b1eb7379f5b74e7cfa1e754604a1f3d
parent8b855eaf40fcb32d37c4cd2c2dbe8ff8be29c88c (diff)
parent55628a376f9dabc330f5ed3d17d6a96300cadf9d (diff)
downloadgitlab-ce-c72c8e9a0effb2947c47977c2bb686578193aaba.tar.gz
Merge branch 'sh-bump-hashie-to-3.5.5' into 'master'
Bump Hashie to 3.5.5 and omniauth to 1.4.2 to eliminate warning noise Closes #28595 See merge request !9534
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
-rw-r--r--changelogs/unreleased/sh-bump-hashie-to-3-5-5.yml4
3 files changed, 8 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 8715acba24f..a3d036792e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'rugged', '~> 0.24.0'
# Authentication libraries
gem 'devise', '~> 4.2'
gem 'doorkeeper', '~> 4.2.0'
-gem 'omniauth', '~> 1.3.2'
+gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-cas3', '~> 1.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b46b09c7544..5ff18442c4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -328,7 +328,7 @@ GEM
temple (~> 0.7.6)
thor
tilt
- hashie (3.4.4)
+ hashie (3.5.5)
health_check (2.2.1)
rails (>= 4.0)
hipchat (1.5.2)
@@ -441,7 +441,7 @@ GEM
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
oj (2.17.4)
- omniauth (1.3.2)
+ omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-auth0 (1.4.1)
@@ -920,7 +920,7 @@ DEPENDENCIES
oauth2 (~> 1.2.0)
octokit (~> 4.6.2)
oj (~> 2.17.4)
- omniauth (~> 1.3.2)
+ omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.0)
omniauth-azure-oauth2 (~> 0.0.6)
diff --git a/changelogs/unreleased/sh-bump-hashie-to-3-5-5.yml b/changelogs/unreleased/sh-bump-hashie-to-3-5-5.yml
new file mode 100644
index 00000000000..57f1474093a
--- /dev/null
+++ b/changelogs/unreleased/sh-bump-hashie-to-3-5-5.yml
@@ -0,0 +1,4 @@
+---
+title: Bump Hashie to 3.5.5 and omniauth to 1.4.2 to eliminate warning noise
+merge_request:
+author: