Merge remote-tracking branch 'upstream/master' into fastboot-log

Author: carols10cents

.travis.yml

@@ -13,19 +13,21 @@ env:
     - JOBS=1 # See https://git.io/vdao3 for details.
     - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
     - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - CARGO_TARGET_DIR=target
+    - CARGO_INCREMENTAL=0
     - PERCY_PARALLEL_TOTAL=2
     # Percy secrets are included here to enable Percy's GitHub integration
     # on community-submitted PRs
     - PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
     - PERCY_PROJECT=crates-io/crates.io
     - PGPORT=5433
+    - PATH=$HOME/.cargo/bin:$PATH
+    - RUSTFLAGS="-C debuginfo=0"
 
 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
+  - which diesel || cargo install diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres
 
 before_script:
   - diesel database setup --locked-schema

Cargo.lock

@@ -7,9 +7,8 @@ export default Component.extend({
   serverError: null,
 
   didInsertElement() {
-    let input = this.element.querySelector('input');
-    if (input.focus) {
-      input.focus();
+    if (this.get('api_token.isNew')) {
+      this.$('input').focus();
     }
   },
 

app/components/api-token-row.js

@@ -1,7 +1,11 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 
 export default Component.extend({
   classNames: ['crate', 'row'],
+  crateTomlText: computed('crate.name', 'max_version', function() {
+    return `${this.get('crate.name')} = "${this.get('crate.max_version')}"`;
+  }),
 
   'data-test-crate-row': true,
 });

app/components/crate-row.js

@@ -0,0 +1,32 @@
+import Component from '@ember/component';
+import { later } from '@ember/runloop';
+
+export default Component.extend({
+  classNames: ['crate-toml-copy'],
+  copyText: '',
+  showSuccess: false,
+  showNotification: false,
+  toggleClipboardProps(isSuccess) {
+    this.setProperties({
+      showSuccess: isSuccess,
+      showNotification: true,
+    });
+    later(
+      this,
+      () => {
+        this.set('showNotification', false);
+      },
+      2000,
+    );
+  },
+  actions: {
+    copySuccess(event) {
+      event.clearSelection();
+      this.toggleClipboardProps(true);
+    },
+
+    copyError() {
+      this.toggleClipboardProps(false);
+    },
+  },
+});

app/components/crate-toml-copy.js

@@ -4,7 +4,6 @@ import Controller from '@ember/controller';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ArrayProxy from '@ember/array/proxy';
 import { computed, observer } from '@ember/object';
-import { later } from '@ember/runloop';
 import moment from 'moment';
 
 const NUM_VERSIONS = 5;
@@ -25,6 +24,9 @@ export default Controller.extend({
   fetchingFollowing: true,
   following: false,
   currentVersion: alias('model'),
+  crateTomlText: computed('crate.name', 'currentVersion.num', function() {
+    return `${this.get('crate.name')} = "${this.get('currentVersion.num')}"`;
+  }),
   requestedVersion: null,
   keywords: alias('crate.keywords'),
   categories: alias('crate.categories'),
@@ -152,30 +154,7 @@ export default Controller.extend({
     return data;
   }),
 
-  toggleClipboardProps(isSuccess) {
-    this.setProperties({
-      showSuccess: isSuccess,
-      showNotification: true,
-    });
-    later(
-      this,
-      () => {
-        this.set('showNotification', false);
-      },
-      2000,
-    );
-  },
-
   actions: {
-    copySuccess(event) {
-      event.clearSelection();
-      this.toggleClipboardProps(true);
-    },
-
-    copyError() {
-      this.toggleClipboardProps(false);
-    },
-
     toggleFollow() {
       this.set('fetchingFollowing', true);
 

app/controllers/crate/version.js

@@ -14,6 +14,7 @@ export default Route.extend({
   },
 
   setupController(controller) {
+    this.controllerFor('application').set('searchQuery', null);
     controller.dataTask.perform();
   },
 });

app/routes/index.js

@@ -14,6 +14,7 @@ export default Route.extend({
   },
 
   setupController(controller, params) {
+    this.controllerFor('application').set('searchQuery', params.q);
     controller.dataTask.perform(params);
   },
 });