Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resync octane with master #1074

Merged
merged 304 commits into from Sep 18, 2019

Conversation

@jenweber
Copy link
Contributor

commented Sep 15, 2019

Our octane branch is waaaaay out of date with master. This the result of a git merge master and resolving lots and lots of conflicts by hand. This PR appears to have many changes, however to review, you should only look at release files. All the others are changes to older versions of Ember Guides.

To review, I would use GitLens and look at only changes to release, or similarly git diff octane -- guides/release/*

One open question, do we want to have the links.md and input-helpers.md in the Table of Contents? I am not sure when/why they were deleted but this PR reintroduces them.

dependabot-preview bot and others added 30 commits Jun 26, 2019
…rk-preset-lint-consistent-2.0.3
…nt-plugin-ember-6.7.0
…r-cli-netlify-0.3.0
Co-Authored-By: Dan Gebhardt <dan@cerebris.com>
Co-Authored-By: Jen Weber <weberj10@gmail.com>
Sync ember-engines content with Ember Engines guides
[REFACTOR] Remove depreaction deprecate-router-events
…test-md

Update text for acceptance-test
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Co-Authored-By: Robert Jackson <me@rwjblue.com>
Minor clean ups to quick start
ppphp and others added 21 commits Sep 5, 2019
fix typo
Update jsmodules.io reference with an MDN Link (#1040)
Fix template filename typo in router guides page
Fix template filename typo in router guides page (v3.12.0 - release)
Change ember-data URLs back to release
…er-cli-babel-7.11.0
Fix template filename typo in router guides page (v3.11.0)
Reference CLI guide in CLI configuration section
@jenweber jenweber requested a review from pzuraq Sep 15, 2019
@jenweber jenweber changed the title Resync with master Resync octane with master Sep 15, 2019
@pzuraq pzuraq self-assigned this Sep 15, 2019
@pzuraq
pzuraq approved these changes Sep 17, 2019
Copy link
Contributor

left a comment

Looks good overall! Left a few comments but they're not related to this PR I think, they should be addressed in separate PRs.

```

As mentioned in the previous section we use the `concat` helper to render both
As mentioned in the previous section, we use the `concat` helper to render both

This comment has been minimized.

Copy link
@pzuraq

pzuraq Sep 17, 2019

Contributor

It looks like the prose here may need to be updated, in a separate PR

@@ -188,8 +189,8 @@ Define a function in `app/helpers/sum.js` to create a `sum` helper:
import { helper as buildHelper } from '@ember/component/helper';
export function sum(params) {

This comment has been minimized.

Copy link
@pzuraq

pzuraq Sep 17, 2019

Contributor

We should update this to reflect the latest blueprints I think:

import { helper } from '@ember/component/helper';

export default helper(function sum([first, second]) {
  return first + second;
});
@jenweber jenweber merged commit 5be7d8d into octane Sep 18, 2019
5 of 7 checks passed
5 of 7 checks passed
Header rules - ember-guides No header rules processed
Details
Pages changed - ember-guides 3886 new files uploaded
Details
Mixed content - ember-guides No mixed content detected
Details
Redirect rules - ember-guides 215 redirect rules processed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
netlify/ember-guides/deploy-preview Deploy preview ready!
Details
percy/guides-app Visual review approved by Jen Weber
Details
@jenweber jenweber deleted the resync-with-master branch Sep 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.