diff --git a/Gemfile b/Gemfile
index 1ce7732e36..df5e871b86 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ end
 gem 'net-ldap', '~> 0.17'
 gem 'omniauth-cas', '~> 2.0'
 gem 'omniauth-saml', '~> 1.10'
-gem 'gitlab-omniauth-openid-connect', '~>0.10.1', require: 'omniauth_openid_connect'
+gem 'omniauth_openid_connect', '~> 0.6'
 gem 'omniauth', '~> 1.9'
 gem 'omniauth-rails_csrf_protection', '~> 0.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f9128de01b..574bb1929c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,10 +279,6 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gitlab-omniauth-openid-connect (0.10.1)
-      addressable (~> 2.7)
-      omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.2)
     globalid (1.1.0)
       activesupport (>= 5.0)
     hamlit (3.0.3)
@@ -449,6 +445,9 @@ GEM
     omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
+    omniauth_openid_connect (0.6.0)
+      omniauth (>= 1.9, < 3)
+      openid_connect (~> 1.1)
     openid_connect (1.4.2)
       activemodel
       attr_required (>= 1.0.0)
@@ -801,7 +800,6 @@ DEPENDENCIES
   fog-core (<= 2.4.0)
   fog-openstack (~> 0.3)
   fuubar (~> 2.5)
-  gitlab-omniauth-openid-connect (~> 0.10.1)
   hamlit-rails (~> 0.2)
   hcaptcha (~> 7.1)
   hiredis (~> 0.6)
@@ -832,6 +830,7 @@ DEPENDENCIES
   omniauth-cas (~> 2.0)
   omniauth-rails_csrf_protection (~> 0.1)
   omniauth-saml (~> 1.10)
+  omniauth_openid_connect (~> 0.6)
   ox (~> 2.14)
   parslet
   pg (~> 1.4)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 62729b78f9..5a81520171 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
     end
 
     def minor
-      0
+      1
     end
 
     def patch
-      2
+      0
     end
 
     def flags
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.1.9'
+      '+1.0.0'
     end
 
     def to_a