Merge remote-tracking branch 'upstream/master' into login-lower-1167

Author: carols10cents

.travis.yml

@@ -12,8 +12,13 @@ cache:
 addons:
   chrome: stable
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
 before_install:
-  - nvm install 8.1.3
+  - nvm install 8
 
 install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
@@ -40,21 +45,16 @@ matrix:
     - rust: nightly
   include:
   - rust: nightly-2017-11-07
-    env: RUSTFMT=YESPLEASE
     script:
     - cargo install --force rustfmt-nightly --vers 0.2.15
-    - export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib:$LD_LIBRARY_PATH
-    - rustfmt --version
+    - cargo install --force clippy --vers 0.0.169
     - cargo fmt -- --write-mode=diff
+    - cargo clippy
   - rust: stable
     script:
     - cargo build
     - cargo test
     - npm test
-  - rust: nightly-2017-11-07
-    env: CLIPPY=YESPLEASE
-    script:
-    - cargo check --features "lint"
   - rust: beta
     script:
     - cargo build

Cargo.lock

@@ -53,10 +53,9 @@ diesel_full_text_search = "0.16.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
-clippy = { version = "=0.0.169", optional = true }
 chrono = { version = "0.4.0", features = ["serde"] }
 comrak = { version = "0.2.3", default-features = false }
-ammonia = "1.0.0-rc3"
+ammonia = "1.0.0"
 docopt = "0.8.1"
 itertools = "0.6.0"
 lettre = "0.6"
@@ -85,10 +84,6 @@ tokio-service = "0.1"
 dotenv = "0.10"
 diesel = { version = "0.16.0", features = ["postgres"] }
 
-[features]
-unstable = []
-lint = ["clippy"]
-
 [replace]
 "diesel:0.16.0" = { git = "https://github.com/diesel-rs/diesel.git" }
 "diesel_codegen:0.16.0" = { git = "https://github.com/diesel-rs/diesel.git" }

Cargo.toml

@@ -4,5 +4,14 @@ export default DS.RESTAdapter.extend({
     namespace: 'api/v1/me',
     pathForType() {
         return 'tokens';
-    }
+    },
+    createRecord(store, type, snapshot) {
+        let data = {};
+        let serializer = store.serializerFor(type.modelName);
+        let url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
+
+        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+
+        return this.ajax(url, 'PUT', { data });
+    },
 });

app/adapters/api-token.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import { pluralize } from 'ember-inflector';
 import { underscore, decamelize } from '@ember/string';
 
 import ApplicationAdapter from './application';
@@ -8,6 +8,6 @@ export default ApplicationAdapter.extend({
         let decamelized = underscore(
             decamelize(modelName)
         );
-        return Ember.String.pluralize(decamelized);
+        return pluralize(decamelized);
     }
 });

app/adapters/category-slug.js

@@ -1,10 +1,10 @@
 import Application from '@ember/application';
+import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 
-import Resolver from './resolver';
 import config from './config/environment';
 
-let App = Application.extend({
+const App = Application.extend({
     modulePrefix: config.modulePrefix,
     podModulePrefix: config.podModulePrefix,
     Resolver

app/app.js

@@ -1,13 +1,15 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
     tagName: 'span',
     classNames: ['badge'],
-    repository: Ember.computed.alias('badge.attributes.repository'),
-    branch: Ember.computed('badge.attributes.branch', function() {
+    repository: alias('badge.attributes.repository'),
+    branch: computed('badge.attributes.branch', function() {
         return encodeURIComponent(this.get('badge.attributes.branch') || 'master');
     }),
-    text: Ember.computed('branch', function() {
+    text: computed('branch', function() {
         return `Circle CI build status for the ${ this.get('branch') } branch`;
     })
 });

app/components/badge-circle-ci.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
     rendered: '',
     didRender() {
         this._super(...arguments);

app/components/crate-readme.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
     isAccepted: false,
     isDeclined: false,
     isError: false,

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

@@ -1,3 +1,4 @@
+import { readOnly } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 
@@ -17,7 +18,7 @@ export default Component.extend({
         }
     }),
 
-    height: computed.readOnly('width'),
+    height: readOnly('width'),
 
     src: computed('size', 'user', function() {
         return `${this.get('user.avatar')}&s=${this.get('width') * 2}`;