From 222e2cc1350a697b4c3973745ce4e50a831df650 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 28 Jan 2015 09:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ErrorHandler=E6=9C=AA?=
 =?UTF-8?q?=E8=83=BD=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/api.rb | 4 ++--
 db/schema.rb          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/api.rb b/app/api/mobile/api.rb
index a17c5c84d..ccf155a92 100644
--- a/app/api/mobile/api.rb
+++ b/app/api/mobile/api.rb
@@ -1,5 +1,5 @@
 module Mobile
-
+  require_relative 'middleware/error_handler'
   class API < Grape::API
     version 'v1', using: :path
     format :json
@@ -33,7 +33,7 @@ module Mobile
     mount Apis::Homeworks
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-     add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) if Rails.env.devlopment?
+     add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 74ba6d652..98476f9dd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,7 +12,6 @@
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20150123020615) do
->>>>>>> szzh
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false