Merge pull request #77 from comorebi-notes/develop

[リリース] v1.1.2
comorebi-notes · Jan 29, 2019 · 235357e · 235357e
2 parents 277a2c8 + 6603b55
commit 235357e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/frontend/constants/releases.js b/app/frontend/constants/releases.js
@@ -223,6 +223,14 @@ const releases = [
         <li>タブレットでの表示を大幅に改善</li>
       </ul>
     )
+  }, {
+    version:    "v1.1.2",
+    updated_at: "2019/1/29",
+    content: (
+      <ul>
+        <li>Google 認証でログインしようとするとエラーになっていたのを修正</li>
+      </ul>
+    )
   }
 ]
 

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -261,7 +261,7 @@
       secure_image_url: true,
       image_size:       "large"
     }
-  config.omniauth :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"]
+  config.omniauth :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"], skip_jwt: true
   config.omniauth :tumblr, ENV["TUMBLR_KEY"], ENV["TUMBLR_SECRET"]
   config.omniauth :github, ENV["GITHUB_KEY"], ENV["GITHUB_SECRET"], scope: "user,repo"
 

diff --git a/config/version.yml b/config/version.yml
@@ -1,5 +1,5 @@
 default: &default
-  version: v1.1.1
+  version: v1.1.2
 
 development:
   <<: *default