Merge branch 'master' of https://github.com/rust-lang/crates.io into …

…reduce-test-allocations

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 sudo: required
-dist: trusty
+dist: xenial
 
 # Ignore this branch per bors-ng documentation
 branches:
@@ -24,8 +24,11 @@ env:
     # on community-submitted PRs
     - PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
     - PERCY_PROJECT=crates-io/crates.io
+    - PGPORT=5433
 
 install:
+  - sudo cp /etc/postgresql/10/main/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
+  - sudo systemctl restart postgresql@11-main
   - script/ci/cargo-clean-on-new-rustc-version.sh
   - cargo install --force diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
@@ -34,7 +37,11 @@ before_script:
 
 addons:
   chrome: stable
-  postgresql: "9.5"
+  postgresql: "11"
+  apt:
+    packages:
+      - postgresql-11
+      - postgresql-client-11
 
 matrix:
   fast_finish: true

app/routes/crate/version.js

@@ -62,7 +62,7 @@ export default Route.extend({
                     .get('versions')
                     .then(versions => {
                         const latestStableVersion = versions.find(version => {
-                            if (!isUnstableVersion(version.get('num'))) {
+                            if (!isUnstableVersion(version.get('num')) && !version.get('yanked')) {
                                 return version;
                             }
                         });

app/routes/github-authorize.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import ajax from 'ember-fetch/ajax';
+import fetch from 'fetch';
 import { serializeQueryParams } from 'ember-fetch/mixins/adapter-fetch';
 
 /**
@@ -19,8 +19,9 @@ export default Route.extend({
     async beforeModel(transition) {
         try {
             let queryParams = serializeQueryParams(transition.queryParams);
-            let d = await ajax(`/authorize?${queryParams}`);
-            let item = JSON.stringify({ ok: true, data: d });
+            let resp = await fetch(`/authorize?${queryParams}`);
+            let json = await resp.json();
+            let item = JSON.stringify({ ok: resp.ok, data: json });
             if (window.opener) {
                 window.opener.github_response = item;
             }

app/routes/login.js

@@ -53,15 +53,15 @@ export default Route.extend({
             if (!response) {
                 return;
             }
-            if (!response.ok) {
-                this.flashMessages.show('Failed to log in');
-                return;
-            }
+
             let { data } = response;
-            if (data.errors) {
+            if (data && data.errors) {
                 let error = `Failed to log in: ${data.errors[0].detail}`;
                 this.flashMessages.show(error);
                 return;
+            } else if (!response.ok) {
+                this.flashMessages.show('Failed to log in');
+                return;
             }
 
             let user = this.store.push(this.store.normalize('user', data.user));

src/boot/categories.toml

@@ -98,6 +98,12 @@ description = """
 Algorithms intended for securing data.\
 """
 
+[cryptography.categories.cryptocurrencies]
+name = "Cryptocurrencies"
+description = """
+Crates for digital currencies, wallets, and distributed ledgers.\
+"""
+
 [database]
 name = "Database interfaces"
 description = """

src/controllers/user/session.rs

@@ -6,6 +6,8 @@ use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 
 use crate::models::{NewUser, User};
+use crate::schema::users;
+use crate::util::errors::{CargoError, ReadOnlyMode};
 
 /// Handles the `GET /authorize_url` route.
 ///
@@ -111,16 +113,30 @@ struct GithubUser {
 }
 
 impl GithubUser {
-    fn save_to_database(&self, access_token: &str, conn: &PgConnection) -> QueryResult<User> {
-        Ok(NewUser::new(
+    fn save_to_database(&self, access_token: &str, conn: &PgConnection) -> CargoResult<User> {
+        NewUser::new(
             self.id,
             &self.login,
             self.email.as_ref().map(|s| &s[..]),
             self.name.as_ref().map(|s| &s[..]),
             self.avatar_url.as_ref().map(|s| &s[..]),
             access_token,
         )
-        .create_or_update(conn)?)
+        .create_or_update(conn)
+        .map_err(Into::into)
+        .or_else(|e: Box<dyn CargoError>| {
+            // If we're in read only mode, we can't update their details
+            // just look for an existing user
+            if e.is::<ReadOnlyMode>() {
+                users::table
+                    .filter(users::gh_id.eq(self.id))
+                    .first(conn)
+                    .optional()?
+                    .ok_or(e)
+            } else {
+                Err(e)
+            }
+        })
     }
 }