Merge branch 'master' into enable-fastboot-2

Cargo.toml

@@ -38,7 +38,7 @@ tar = "0.4.16"
 base64 = "0.9"
 
 openssl = "0.10.13"
-oauth2 = "0.3"
+oauth2 = "2.0.0"
 log = "0.4"
 env_logger = "0.5"
 hex = "0.3"
@@ -83,12 +83,14 @@ tokio = "0.1"
 hyper = "0.12"
 ctrlc = { version = "3.0", features = ["termination"] }
 indexmap = "1.0.2"
+handlebars = "2.0.1"
 
 [dev-dependencies]
 conduit-test = "0.8"
 hyper-tls = "0.3"
 lazy_static = "1.0"
 tokio-core = "0.1"
+diesel_migrations = { version = "1.3.0", features = ["postgres"] }
 
 [build-dependencies]
 dotenv = "0.11"

RustConfig

@@ -1 +1 @@
-VERSION=1.33.0
+VERSION=1.38.0

app/components/crate-readme.js

@@ -7,5 +7,13 @@ export default Component.extend({
     this.$('pre > code').each(function() {
       window.Prism.highlightElement(this);
     });
+    this.scrollToFragment();
+  },
+
+  scrollToFragment() {
+    if (location.hash) {
+      let anchor_id = location.hash.substr(1);
+      document.getElementById(anchor_id).scrollIntoView();
+    }
   },
 });

app/components/email-input.js

@@ -100,9 +100,9 @@ export default Component.extend({
         await ajax(`/api/v1/users/${user.id}/resend`, { method: 'PUT' });
         this.set('disableResend', true);
       } catch (error) {
-        if (error.payload) {
+        if (error.errors) {
           this.set('isError', true);
-          this.set('emailError', `Error in resending message: ${error.payload.errors[0].detail}`);
+          this.set('emailError', `Error in resending message: ${error.errors[0].detail}`);
         } else {
           this.set('isError', true);
           this.set('emailError', 'Unknown error in resending message');

app/components/pending-owner-invite-row.js

@@ -15,8 +15,8 @@ export default Component.extend({
         this.set('isAccepted', true);
       } catch (error) {
         this.set('isError', true);
-        if (error.payload) {
-          this.set('inviteError', `Error in accepting invite: ${error.payload.errors[0].detail}`);
+        if (error.errors) {
+          this.set('inviteError', `Error in accepting invite: ${error.errors[0].detail}`);
         } else {
           this.set('inviteError', 'Error in accepting invite');
         }
@@ -31,8 +31,8 @@ export default Component.extend({
         this.set('isDeclined', true);
       } catch (error) {
         this.set('isError', true);
-        if (error.payload) {
-          this.set('inviteError', `Error in declining invite: ${error.payload.errors[0].detail}`);
+        if (error.errors) {
+          this.set('inviteError', `Error in declining invite: ${error.errors[0].detail}`);
         } else {
           this.set('inviteError', 'Error in declining invite');
         }

app/controllers/crate/owners.js

@@ -23,8 +23,8 @@ export default Controller.extend({
         await this.crate.inviteOwner(username);
         this.set('invited', `An invite has been sent to ${username}`);
       } catch (error) {
-        if (error.payload) {
-          this.set('error', `Error sending invite: ${error.payload.errors[0].detail}`);
+        if (error.errors) {
+          this.set('error', `Error sending invite: ${error.errors[0].detail}`);
         } else {
           this.set('error', 'Error sending invite');
         }
@@ -40,8 +40,8 @@ export default Controller.extend({
 
         this.get('crate.owner_user').removeObject(user);
       } catch (error) {
-        if (error.payload) {
-          this.set('removed', `Error removing owner: ${error.payload.errors[0].detail}`);
+        if (error.errors) {
+          this.set('removed', `Error removing owner: ${error.errors[0].detail}`);
         } else {
           this.set('removed', 'Error removing owner');
         }

app/router.js

@@ -46,6 +46,7 @@ Router.map(function() {
   this.route('category-slugs', { path: 'category_slugs' });
   this.route('team', { path: '/teams/:team_id' });
   this.route('policies');
+  this.route('data-access');
   this.route('confirm', { path: '/confirm/:email_token' });
 
   this.route('catch-all', { path: '*path' });

app/routes/confirm.js

@@ -26,8 +26,8 @@ export default Route.extend({
         });
       }
     } catch (error) {
-      if (error.payload) {
-        this.flashMessages.queue(`Error in email confirmation: ${error.payload.errors[0].detail}`);
+      if (error.errors) {
+        this.flashMessages.queue(`Error in email confirmation: ${error.errors[0].detail}`);
         return this.replaceWith('index');
       } else {
         this.flashMessages.queue(`Unknown error in email confirmation`);