jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
sw 2015-01-28 09:28:30 +08:00
parent aa3856b2e9 222e2cc135
commit 74a8d9ecb9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile.lock
View File

@ -96,6 +96,8 @@ GEM
execjs (2.2.1) execjs (2.2.1)
factory_girl (4.4.0) factory_girl (4.4.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
faker (1.4.3)
i18n (~> 0.5)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.3) ffi (1.9.3)
ffi (1.9.3-x86-mingw32) ffi (1.9.3-x86-mingw32)
@ -314,6 +316,7 @@ DEPENDENCIES
coderay (~> 1.0.6) coderay (~> 1.0.6)
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
factory_girl (~> 4.4.0) factory_girl (~> 4.4.0)
faker
fastercsv (~> 1.5.0) fastercsv (~> 1.5.0)
grape (~> 0.9.0) grape (~> 0.9.0)
grape-entity grape-entity

4
app/api/mobile/api.rb
View File

@ -1,5 +1,5 @@
module Mobile module Mobile
require_relative 'middleware/error_handler'
class API < Grape::API class API < Grape::API
version 'v1', using: :path version 'v1', using: :path
format :json format :json
@ -33,7 +33,7 @@ module Mobile
mount Apis::Homeworks 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: 'http://u06.shellinfo.cn/trustie/api'})
add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) add_swagger_documentation ({api_version: 'v1', base_path: '/api'}) if Rails.env.development?
end end
end end

1
db/schema.rb
View File

@ -12,7 +12,6 @@
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20150123020615) do ActiveRecord::Schema.define(:version => 20150123020615) do
>>>>>>> szzh
create_table "activities", :force => true do |t| create_table "activities", :force => true do |t|
t.integer "act_id", :null => false t.integer "act_id", :null => false