diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-23 20:43:06 +0000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-23 20:43:06 +0000 |
| commit | e62de52aa398341a29b7ecef4ec9f9df8e1743e2 (patch) | |
| tree | 3a87677e000259ecc0ced6bc93afc03fea73493b /railties/guides/code/getting_started/app | |
| parent | afd7140b66e7cb32e1be58d9e44489e6bcbde0dc (diff) | |
| parent | fd86a1b6b068df87164d5763bdcd4a323a1e76f4 (diff) | |
| download | rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.tar.gz rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.tar.bz2 rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.zip | |
Merge branch 'master' into serializers
Diffstat (limited to 'railties/guides/code/getting_started/app')
| -rw-r--r-- | railties/guides/code/getting_started/app/controllers/posts_controller.rb | 4 | ||||
| -rw-r--r-- | railties/guides/code/getting_started/app/views/layouts/application.html.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/code/getting_started/app/controllers/posts_controller.rb b/railties/guides/code/getting_started/app/controllers/posts_controller.rb index 7e903c984c..1581d4eb16 100644 --- a/railties/guides/code/getting_started/app/controllers/posts_controller.rb +++ b/railties/guides/code/getting_started/app/controllers/posts_controller.rb @@ -62,7 +62,7 @@ class PostsController < ApplicationController respond_to do |format| if @post.update_attributes(params[:post]) format.html { redirect_to @post, notice: 'Post was successfully updated.' } - format.json { head :ok } + format.json { head :no_content } else format.html { render action: "edit" } format.json { render json: @post.errors, status: :unprocessable_entity } @@ -78,7 +78,7 @@ class PostsController < ApplicationController respond_to do |format| format.html { redirect_to posts_url } - format.json { head :ok } + format.json { head :no_content } end end end diff --git a/railties/guides/code/getting_started/app/views/layouts/application.html.erb b/railties/guides/code/getting_started/app/views/layouts/application.html.erb index 1e1e4b9a99..7fd6b4f516 100644 --- a/railties/guides/code/getting_started/app/views/layouts/application.html.erb +++ b/railties/guides/code/getting_started/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ <html> <head> <title>Blog</title> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> </head> |