README.md in ember-cli-rails-0.5.6 vs README.md in ember-cli-rails-0.5.7

- old
+ new

@@ -61,11 +61,11 @@ ``` * generate a new Ember project: ```bash -$ ember new frontend +$ ember new frontend --skip-git ``` **Initializer options** - `name` - this represents the name of the Ember CLI application. @@ -90,11 +90,11 @@ Be sure that the addon's [`MAJOR` and `MINOR` version][semver] matches the gem's `MAJOR` and `MINOR` versions. For instance, if you're using the `0.5.x` version of the gem, specify -`~> 0.5.0` ion in your Ember app's `package.json`: +`~> 0.5.0` in your Ember app's `package.json`: ```json { "devDependencies": { "ember-cli-rails-addon": "~> 0.5.0" @@ -176,10 +176,19 @@ render layout: false end end ``` +**NOTE** + +When specifying a controller of your own, make sure [the controller is a +descendant of `ApplicationController`][#321], and [`ApplicationController` is a +descendant of `ActionController::Base`][#320]. + +[#320]: https://github.com/thoughtbot/ember-cli-rails/issues/320 +[#321]: https://github.com/thoughtbot/ember-cli-rails/issues/321 + ### Rendering the EmberCLI generated JS and CSS In addition to rendering the EmberCLI generated `index.html`, you can inject the `<script>` and `<link>` tags into your Rails generated views: @@ -187,10 +196,14 @@ <!-- app/views/application/index.html.erb --> <%= include_ember_script_tags :frontend %> <%= include_ember_stylesheet_tags :frontend %> ``` +**NOTE** + +These helpers are only available for Rails versions `>= 4.0`. + ### Multiple Ember CLI apps In the initializer you may specify multiple Ember CLI apps, each of which can be referenced with the view helper independently. You'd accomplish this like so: @@ -240,23 +253,10 @@ ... } } ``` -Finally, configure each app's `router.js` file so that `rootURL` refers to the -new `baseURL`: - -```javascript -/* app/frontend/app/router.js */ -var Router = Ember.Router.extend({ - rootURL: config.baseURL, // add this line - location: config.locationType -}); -``` - -Repeat the process for `admin_panel/app/router.js`. - ## CSRF Tokens Your Rails controllers, by default, are expecting a valid authenticity token to be submitted with non-`GET` requests. Without it you'll receive a `422 Unprocessable Entity` error, specifically: `ActionController::InvalidAuthenticityToken`. @@ -521,13 +521,17 @@ ## Ruby and Rails support This project supports: * Ruby versions `>= 2.1.0` -* Rails `3.2.x` and `>=4.1.x`. +* Rails versions `3.2.x` and `>=4.1.x`. +[Rendering EmberCLI-generated assets through Sprockets](asset-helpers) is +**NOT** supported for Rails `3.2.x`. + To learn more about supported versions and upgrades, read the [upgrading guide]. +[asset-helpers]: #rendering-the-embercli-generated-js-and-css [upgrading guide]: /UPGRADING.md ## Contributing See the [CONTRIBUTING] document.