Skip to content
This repository has been archived by the owner on Mar 22, 2019. It is now read-only.

[On Hold] Removed Ember.merge from the list of 2.x deprecations. #2561

Merged
merged 1 commit into from
Apr 26, 2016
+0 −22
Merged

[On Hold] Removed Ember.merge from the list of 2.x deprecations. #2561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions source/deprecations/v2.x.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,28 +363,6 @@ Support the following forms will be removed after 2.4:
{{/render}}
```

### Deprecations Added in 2.5

#### Ember.merge

##### until: 3.0.0
##### id: ember-metal.merge

`Ember.merge` is deprecated in favor of `Ember.assign`, which is now a public API since Ember 2.5. For typical usages, this
should be a 1-to-1 replacement:

Before:

```js
Ember.merge({}, defaultOptions);
```

After:

```js
Ember.assign({}, defaultOptions);
```

### Deprecations Added in 2.6

#### Use Ember.String.htmlSafe over Ember.Handlebars.SafeString
Expand Down