Merge pull request #460 from crowi/wip-v1.7.8

sotarok · web-flow · commit f06d452b7621 · 2019-06-29T16:47:55.000+09:00
Prepare v1.7.8
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,7 @@
 CHANGES
 ========
 
-## 1.7.7
+## 1.7.8
 
 - Feature: Recently viewd page list appears when focus on search bar (#415)
 - Feature: Rebuild search index without downtime (#406)
@@ -15,6 +15,10 @@ CHANGES
 - Fix: Update config correctly even run Crowi with multiple servers (#435)
 - and some fixes. (Thank you @okonomi, @inductor, @potato4d
 
+## 1.7.7
+
+- Release revoked.
+
 ## 1.7.6
 - Fix: error occurs in admin/share page after a shared page was completely deleted (#393)
 - Improve: Resize profile image before upload (#400)
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM node:8.11.2
 
 ARG NODE_ENV="production"
 
-ENV CROWI_VERSION v1.7.7
+ENV CROWI_VERSION v1.7.8
 ENV NODE_ENV ${NODE_ENV}
 
 WORKDIR /crowi
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Crowi - Empower the team with sharing your knowledge.
 ================================================================
 
 
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/crowi/crowi/tree/v1.7.7)
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/crowi/crowi/tree/v1.7.8)
 
 [![Circle CI](https://circleci.com/gh/crowi/crowi.svg?style=svg)](https://circleci.com/gh/crowi/crowi)
 [![Docker Pulls](https://img.shields.io/docker/pulls/crowi/crowi.svg)](https://hub.docker.com/r/crowi/crowi)
diff --git a/lib/util/middlewares.js b/lib/util/middlewares.js
@@ -11,7 +11,7 @@ exports.loginChecker = function(crowi, app) {
 
     // session に user object が入ってる
     if (req.session.user && '_id' in req.session.user) {
-      User.findById(req.session.user._id, '+password', function(err, userData) {
+      User.findById(req.session.user._id, '+password +apiToken', function(err, userData) {
         if (err) {
           next()
         } else {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crowi",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "The simple & powerful Wiki",
   "tags": [
     "wiki",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "crowi",`
`3`		`- "version": "1.7.7",`
	`3`	`+ "version": "1.7.8",`
`4`	`4`	`"description": "The simple & powerful Wiki",`
`5`	`5`	`"tags": [`
`6`	`6`	`"wiki",`