|
|
@ -1,5 +1,4 @@
|
|
|
|
class ChallengesController < ApplicationController
|
|
|
|
class ChallengesController < ApplicationController
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
before_action :require_login, :check_auth
|
|
|
|
before_action :require_login, :check_auth
|
|
|
|
before_action :find_shixun, only: [:new, :create, :index]
|
|
|
|
before_action :find_shixun, only: [:new, :create, :index]
|
|
|
|
skip_before_action :verify_authenticity_token, only: [:create, :update, :create_choose_question, :crud_answer]
|
|
|
|
skip_before_action :verify_authenticity_token, only: [:create, :update, :create_choose_question, :crud_answer]
|
|
|
|