Merge branch 'pre_trustie_server' into trustie_server

config/locales/forms/api_v1_service.zh-CN.yml

@@ -0,0 +1,5 @@
+'zh-CN':
+  activemodel:
+    attributes:
+      api/v1/users/feedbacks/create_service:
+        content: "反馈意见"

config/locales/zh-CN.yml

@@ -231,6 +231,8 @@ zh-CN:
       ignore:
         name: 'git忽略文件名称'
         content: 'git忽略文件内容'
+      feedback_message_history: 
+        title: ''
     close_pr: 合并请求
   roles: 
     Developer: 开发者 

config/routes.rb

@@ -942,6 +942,10 @@ Rails.application.routes.draw do
     resources :nps do
       post :switch_change, on: :collection
     end
+    resources :feedbacks, only: [:index, :destroy] do 
+      get :new_history, on: :member
+      post :create_history, on: :member
+    end
     resources :laboratories, only: [:index, :create, :destroy, :update] do
       member do
         get :shixuns_for_select

config/routes/api.rb

@@ -13,6 +13,7 @@ defaults format: :json do
         end
         scope module: :users do 
           resources :projects, only: [:index]
+          resources :feedbacks, only: [:create]
         end
 
         scope ':repo' do