Merge branch 'master' into rc/2.3.0

CHANGES.md

@@ -1,7 +1,12 @@
 CHANGES
 ========
 
-## 2.2.4-RC
+## 2.2.4
+
+* Fix: googleapis v23.0.0 lost the function `oauth2Client.setCredentials`
+    * Degraded by 2.2.2 updates
+* Fix: HeaderSearchBox didn't append 'q=' param when searching
+    * Degraded by 2.2.3 updates
 
 * Feature: LDAP Authentication
 

lib/util/googleAuth.js

@@ -49,9 +49,7 @@ module.exports = function(config) {
         return callback(new Error('[googleAuth.handleCallback] Error to get token.'), null);
       }
 
-      oauth2Client.setCredentials({
-        access_token: tokens.access_token,
-      });
+      oauth2Client.credentials = tokens;
 
       var oauth2 = google.oauth2('v2');
       oauth2.userinfo.get({}, function(err, response) {

resource/js/components/HeaderSearchBox/SearchForm.js

@@ -121,6 +121,7 @@ export default class SearchForm extends React.Component {
           <InputGroup>
             <AsyncTypeahead
               ref={ref => this._typeahead = ref}
+              name="q"
               isLoading={this.state.isLoading}
               labelKey="path"
               minLength={2}