Merge branch 'dev_trainings' into develop

dev_trainings
p31729568 6 years ago
commit 3f6bf8d1f6

@ -5,10 +5,10 @@ class TrainingsController < ApplicationController
skip_before_filter :verify_signature, only: [:show, :create, :test] skip_before_filter :verify_signature, only: [:show, :create, :test]
# ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}" ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}"
#
# before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback] before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback]
#
before_filter :find_tag_id before_filter :find_tag_id
before_filter :find_training, only: [:show, :test] before_filter :find_training, only: [:show, :test]

Loading…
Cancel
Save