Merge branch 'master' into 'master'

实训评测任务超出规定范围，提示用户等待信息

实训评测任务超出规定范围，提示用户等待信息

See merge request !22

app/controllers/blogs_controller.rb

@@ -70,10 +70,7 @@ class BlogsController < ApplicationController
                    :author_id=>params[:id])
   end
   def update
- @blog = Blog.find(params[:id])
-    @blog.update_attribute(:homepage_id, params[:article_id])
-    redirect_to user_path(params[:user_id])
-  end
+ 
   def new
 @blog = Blog.find(params[:id])
     @blog.update_attribute(:homepage_id, nil)