Skip to content

Commit

Permalink
Use https in references to emberjs website (emberjs#4992)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmadsoe authored and sudowork committed Jun 20, 2017
1 parent 5cc9d2d commit cb9b3f2
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@
### Release 2.3.0 (January 12, 2016)

Ember Data 2.3 is now published as and Ember CLI addon in addition to a bower package.
See the [release notes](http://emberjs.com/blog/2016/01/12/ember-data-2-3-released.html#toc_changes-in-ember-data-2-3)
See the [release notes](https://emberjs.com/blog/2016/01/12/ember-data-2-3-released.html#toc_changes-in-ember-data-2-3)
for instruction on how to upgrade your Ember CLI project to take advantage of the Ember Data addon.

- [#4039](https://github.com/emberjs/data/pull/4039) Replace calls to store.find with store.findRecord
Expand Down Expand Up @@ -1242,7 +1242,7 @@ post.constructor.typeKey => postSnapshot.typeKey
If you need to access the underlying record of a snapshot you can do so by
accessing `snapshot.record`.

The full API reference of `DS.Snapshot` can be found [here](http://emberjs.com/api/data/classes/DS.Snapshot.html).
The full API reference of `DS.Snapshot` can be found [here](https://emberjs.com/api/data/classes/DS.Snapshot.html).

#### Changes
* Do not re-add deleted records to a hasMany relationship
Expand Down Expand Up @@ -1475,7 +1475,7 @@ to set metadata.


##### `ManyArray`s are no longer `RecordArray`s
[ManyArray](http://emberjs.com/api/data/classes/DS.ManyArray.html),
[ManyArray](https://emberjs.com/api/data/classes/DS.ManyArray.html),
the object Ember Data uses to represent `DS.hasMany` relationships has
been changed so it no longer extends from `RecordArray`. This means if
you were relying on the RecordArray's `content` property to access the
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ The Ember team and community are committed to everyone having a safe and inclusi

**Our Community Guidelines / Code of Conduct can be found here**:

http://emberjs.com/guidelines/
https://emberjs.com/guidelines/

For a history of updates, see the page history here:

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Documentation commits are tagged as `[DOC channel]` where channel is `canary`,

### Security

Security commits will be tagged as `[SECURITY cve]`. Please do not submit security related PRs without coordinating with the security team. See the [Security Policy](http://emberjs.com/security/) for more information.
Security commits will be tagged as `[SECURITY cve]`. Please do not submit security related PRs without coordinating with the security team. See the [Security Policy](https://emberjs.com/security/) for more information.

### Other

Expand Down
2 changes: 1 addition & 1 deletion FEATURES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## About Features

Please read the [Feature Flag Guide](http://emberjs.com/guides/configuring-ember/feature-flags/)
Please read the [Feature Flag Guide](https://emberjs.com/guides/configuring-ember/feature-flags/)
for a detailed explanation.

To add a new feature flag or change an existing one, you can add an
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ bower install ember-data --save
```

The latest passing build from the "master" branch is available on
[http://emberjs.com/builds/#/canary](http://emberjs.com/builds/#/canary).
[https://emberjs.com/builds/#/canary](https://emberjs.com/builds/#/canary).

Similarly, the latest passing build from the "beta" branch can be found
on [http://emberjs.com/builds/#/beta](http://emberjs.com/builds/#/beta)
on [https://emberjs.com/builds/#/beta](https://emberjs.com/builds/#/beta)

Or build ember-data.js yourself. Clone the repository and run `npm run build:production`
after [setup](#setup). You'll find ember-data.js in the `dist` directory.
Expand Down Expand Up @@ -142,7 +142,7 @@ By default, Ember Data will use the `JSONAPIAdapter`, which adheres to the [JSON

To learn more about adapters, including what conventions the
various adapters follow and how to build your own, see the Ember.js
Guides: [Customizing Adapters](http://emberjs.com/guides/models/customizing-adapters).
Guides: [Customizing Adapters](https://emberjs.com/guides/models/customizing-adapters).

### Fetching a Collection of Models

Expand All @@ -167,7 +167,7 @@ promise will be rejected.
### Even More Documentation

For much more detail on how to use Ember Data, see the [Ember.js Guides
on models](http://emberjs.com/guides/models/).
on models](https://emberjs.com/guides/models/).

# Building Ember Data

Expand Down
6 changes: 3 additions & 3 deletions addon/-private/system/model/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ Model.reopenClass({
} else {
//No inverse was specified manually, we need to use a heuristic to guess one
if (propertyMeta.parentType && propertyMeta.type === propertyMeta.parentType.modelName) {
warn(`Detected a reflexive relationship by the name of '${name}' without an inverse option. Look at http://emberjs.com/guides/models/defining-models/#toc_reflexive-relation for how to explicitly specify inverses.`, false, {
warn(`Detected a reflexive relationship by the name of '${name}' without an inverse option. Look at https://emberjs.com/guides/models/defining-models/#toc_reflexive-relation for how to explicitly specify inverses.`, false, {
id: 'ds.model.reflexive-relationship-without-inverse'
});
}
Expand All @@ -1330,15 +1330,15 @@ Model.reopenClass({
});

assert("You defined the '" + name + "' relationship on " + this + ", but you defined the inverse relationships of type " +
inverseType.toString() + " multiple times. Look at http://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses",
inverseType.toString() + " multiple times. Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses",
filteredRelationships.length < 2);

if (filteredRelationships.length === 1 ) {
possibleRelationships = filteredRelationships;
}

assert("You defined the '" + name + "' relationship on " + this + ", but multiple possible inverse relationships of type " +
this + " were found on " + inverseType + ". Look at http://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses",
this + " were found on " + inverseType + ". Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses",
possibleRelationships.length === 1);

inverseName = possibleRelationships[0].name;
Expand Down
4 changes: 2 additions & 2 deletions addon/-private/system/relationships/belongs-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ export default function belongsTo(modelName, options) {
return Ember.computed({
get(key) {
if (opts.hasOwnProperty('serialize')) {
warn(`You provided a serialize option on the "${key}" property in the "${this._internalModel.modelName}" class, this belongs in the serializer. See DS.Serializer and it's implementations http://emberjs.com/api/data/classes/DS.Serializer.html`, false, {
warn(`You provided a serialize option on the "${key}" property in the "${this._internalModel.modelName}" class, this belongs in the serializer. See DS.Serializer and it's implementations https://emberjs.com/api/data/classes/DS.Serializer.html`, false, {
id: 'ds.model.serialize-option-in-belongs-to'
});
}

if (opts.hasOwnProperty('embedded')) {
warn(`You provided an embedded option on the "${key}" property in the "${this._internalModel.modelName}" class, this belongs in the serializer. See DS.EmbeddedRecordsMixin http://emberjs.com/api/data/classes/DS.EmbeddedRecordsMixin.html`, false, {
warn(`You provided an embedded option on the "${key}" property in the "${this._internalModel.modelName}" class, this belongs in the serializer. See DS.EmbeddedRecordsMixin https://emberjs.com/api/data/classes/DS.EmbeddedRecordsMixin.html`, false, {
id: 'ds.model.embedded-option-in-belongs-to'
});
}
Expand Down
8 changes: 4 additions & 4 deletions addon/-private/system/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ Store = Service.extend({
### Retrieving Related Model Records
If you use an adapter such as Ember's default
[`JSONAPIAdapter`](http://emberjs.com/api/data/classes/DS.JSONAPIAdapter.html)
[`JSONAPIAdapter`](https://emberjs.com/api/data/classes/DS.JSONAPIAdapter.html)
that supports the [JSON API specification](http://jsonapi.org/) and if your server
endpoint supports the use of an
['include' query parameter](http://jsonapi.org/format/#fetching-includes),
Expand Down Expand Up @@ -1249,7 +1249,7 @@ Store = Service.extend({
```
This method returns a promise, which is resolved with an
[`AdapterPopulatedRecordArray`](http://emberjs.com/api/data/classes/DS.AdapterPopulatedRecordArray.html)
[`AdapterPopulatedRecordArray`](https://emberjs.com/api/data/classes/DS.AdapterPopulatedRecordArray.html)
once the server returns.
@since 1.13.0
Expand Down Expand Up @@ -1551,7 +1551,7 @@ Store = Service.extend({
### Retrieving Related Model Records
If you use an adapter such as Ember's default
[`JSONAPIAdapter`](http://emberjs.com/api/data/classes/DS.JSONAPIAdapter.html)
[`JSONAPIAdapter`](https://emberjs.com/api/data/classes/DS.JSONAPIAdapter.html)
that supports the [JSON API specification](http://jsonapi.org/) and if your server
endpoint supports the use of an
['include' query parameter](http://jsonapi.org/format/#fetching-includes),
Expand Down Expand Up @@ -2067,7 +2067,7 @@ Store = Service.extend({
The class of a model might be useful if you want to get a list of all the
relationship names of the model, see
[`relationshipNames`](http://emberjs.com/api/data/classes/DS.Model.html#property_relationshipNames)
[`relationshipNames`](https://emberjs.com/api/data/classes/DS.Model.html#property_relationshipNames)
for example.
@method modelFor
Expand Down
2 changes: 1 addition & 1 deletion addon/-private/system/store/finders.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function _find(adapter, store, modelClass, id, internalModel, options) {
let payload = normalizeResponseHelper(serializer, store, modelClass, adapterPayload, id, 'findRecord');
assert(`Ember Data expected the primary data returned from a 'findRecord' response to be an object but instead it found an array.`, !Array.isArray(payload.data));

warn(`You requested a record of type '${modelName}' with id '${id}' but the adapter returned a payload with primary data having an id of '${payload.data.id}'. Use 'store.findRecord()' when the requested id is the same as the one returned by the adapter. In other cases use 'store.queryRecord()' instead http://emberjs.com/api/data/classes/DS.Store.html#method_queryRecord`, payload.data.id === id, {
warn(`You requested a record of type '${modelName}' with id '${id}' but the adapter returned a payload with primary data having an id of '${payload.data.id}'. Use 'store.findRecord()' when the requested id is the same as the one returned by the adapter. In other cases use 'store.queryRecord()' instead https://emberjs.com/api/data/classes/DS.Store.html#method_queryRecord`, payload.data.id === id, {
id: 'ds.store.findRecord.id-mismatch'
});

Expand Down
2 changes: 1 addition & 1 deletion addon/serializers/json-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ if (DEBUG) {
JSONAPISerializer.reopen({
willMergeMixin(props) {
let constructor = this.constructor;
warn(`You've defined 'extractMeta' in ${constructor.toString()} which is not used for serializers extending JSONAPISerializer. Read more at http://emberjs.com/api/data/classes/DS.JSONAPISerializer.html#toc_customizing-meta on how to customize meta when using JSON API.`, Ember.isNone(props.extractMeta) || props.extractMeta === JSONSerializer.prototype.extractMeta, {
warn(`You've defined 'extractMeta' in ${constructor.toString()} which is not used for serializers extending JSONAPISerializer. Read more at https://emberjs.com/api/data/classes/DS.JSONAPISerializer.html#toc_customizing-meta on how to customize meta when using JSON API.`, Ember.isNone(props.extractMeta) || props.extractMeta === JSONSerializer.prototype.extractMeta, {
id: 'ds.serializer.json-api.extractMeta'
});
warn('The JSONAPISerializer does not work with the EmbeddedRecordsMixin because the JSON API spec does not describe how to format embedded resources.', !props.isEmbeddedRecordsMixin, {
Expand Down
2 changes: 1 addition & 1 deletion blueprints/model/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function dsAttr(name, type) {
return 'DS.hasMany(\'' + name + '\')';
case '':
//"If you don't specify the type of the attribute, it will be whatever was provided by the server"
//http://emberjs.com/guides/models/defining-models/
//https://emberjs.com/guides/models/defining-models/
return 'DS.attr()';
default:
return 'DS.attr(\'' + type + '\')';
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/inverse-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ testInDebug("Errors out if you define 2 inverses to the same model", function(as

assert.expectAssertion(function() {
User.inverseFor('job', store);
}, "You defined the 'job' relationship on user, but you defined the inverse relationships of type job multiple times. Look at http://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses");
}, "You defined the 'job' relationship on user, but you defined the inverse relationships of type job multiple times. Look at https://emberjs.com/guides/models/defining-models/#toc_explicit-inverses for how to explicitly specify inverses");
});


Expand Down

0 comments on commit cb9b3f2

Please sign in to comment.