Merge branch 'master' into 'master'

Gitlab hook触发机制 See merge request !6
2017-10-17 09:13:45 +08:00 · 2017-10-17 09:13:45 +08:00 · 449eacb972
parent 7d95c70720 f624cae813
commit 449eacb972
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@ -53,7 +53,7 @@ class ShixunsController < ApplicationController

  # push代码的时候会触发gitlab hook
  def ghook
-    # shixun_modify_status_without_publish(@shixun, 1)
+    shixun_modify_status_without_publish(@shixun, 1)
    render :json => {status: "success"}
  end