diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 91593f81..27a6f564 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -24,7 +24,7 @@ class AccountController < ApplicationController skip_before_filter :check_if_login_required skip_before_filter :check_authentication, :only => [:login, :logout, :user_join, :avatar, :authentication, :professional_certification, :security_settings, :change_psd, :user_info] before_filter :auth_login1, :only => [:avatar, :authentication, :professional_certification, :security_settings, :change_psd, :reset_psd, :user_info] - skip_before_filter :verify_authenticity_token, :only =>[:codepedia_login, :login] + skip_before_filter :verify_authenticity_token, :only =>[:codepedia_login, :login, :register] before_filter :require_login, only: [:avatar, :authentication, :professional_certification, :security_settings, :change_psd, :user_info, :user_auth, :apply_auth, :apply_pro_certification, :check_student_id, :bind_email, :change_or_bind] include ApplicationHelper diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb index d69af046..b68a4f57 100644 --- a/app/views/shixuns/_settings_edit.html.erb +++ b/app/views/shixuns/_settings_edit.html.erb @@ -106,7 +106,7 @@

* -
+
diff --git a/lib/gitlab-cli/bin/gitlab b/lib/gitlab-cli/bin/gitlab index af0fd0cc..2204bef3 100644 --- a/lib/gitlab-cli/bin/gitlab +++ b/lib/gitlab-cli/bin/gitlab @@ -1,5 +1,5 @@ #!/usr/bin/env ruby - +# $:.unshift File.expand_path('../../lib', __FILE__) require 'gitlab/cli' diff --git a/lib/grack/bin/console b/lib/grack/bin/console index b9297ffa..1452359a 100644 --- a/lib/grack/bin/console +++ b/lib/grack/bin/console @@ -1,5 +1,6 @@ #! /bin/bash +### set -e cd $(dirname "$0")/.. diff --git a/lib/grack/bin/testserver b/lib/grack/bin/testserver index 3c0db5b3..1099ec4a 100644 --- a/lib/grack/bin/testserver +++ b/lib/grack/bin/testserver @@ -4,7 +4,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) Bundler.require(:default, :development) - require 'grack' require 'rack' root = File.absolute_path( File.join( File.dirname(__FILE__), '../examples' ) ) diff --git a/lib/wechat/bin/wechat b/lib/wechat/bin/wechat index d5563802..e20639a7 100644 --- a/lib/wechat/bin/wechat +++ b/lib/wechat/bin/wechat @@ -1,6 +1,6 @@ #coding=utf-8 #!/usr/bin/env ruby - +### lib = File.expand_path(File.dirname(__FILE__) + '/../lib') $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib) diff --git a/public/react/src/modules/page/component/TPICodeMirror.js b/public/react/src/modules/page/component/TPICodeMirror.js index 4ae5cc79..381a8a8a 100644 --- a/public/react/src/modules/page/component/TPICodeMirror.js +++ b/public/react/src/modules/page/component/TPICodeMirror.js @@ -12,7 +12,6 @@ import Drawer from 'material-ui/Drawer'; import './TPICodeMirror.css' import TPICodeSetting from './TPICodeSetting' - import { fromStore, toStore } from 'educoder' require('codemirror/lib/codemirror.css'); // require('codemirror/mode/javascript/javascript');