Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

2016-07-29 23:50:39 +08:00 · 2016-07-29 23:50:39 +08:00 · 8e805d382a
parent 6ea829131b 30ce469483
commit 8e805d382a
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/applied_project_controller.rb
+++ b/app/controllers/applied_project_controller.rb
@ -64,7 +64,7 @@ class AppliedProjectController < ApplicationController
      role = params[:member] == "member_manager" ? 3 : (params[:member] == "member_developer" ? 4 :5)
      applied_project = AppliedProject.create(:user_id => User.current.id, :project_id => @project.id, :role => role)
      # 申请成功则给项目管理员发送邮件及发送消息
-      Mailer.run.applied_project(applied_project)
+      # Mailer.run.applied_project(applied_project)
    end
  end