From db1f99cb13e14f2130b0aa5706aafb641958a3a1 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 1 Mar 2019 11:21:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 43e9ef82..842249d6 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -12,7 +12,7 @@ class CoursesController < ApplicationController helper :graduation_tasks include ApplicationHelper helper SyllabusesHelper - + # before_filter :auth_login1, :only => [:show, :course_activity, :feedback] if Redmine::Configuration['gitlab_address'].include?("test") skip_before_filter :verify_authenticity_token, :only => [:update_course_module, :join_course_multi_role] From 29e661019b41e1b3ae5d980de9174ba171f11b2b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 1 Mar 2019 11:26:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- lib/gitlab-cli/bin/gitlab | 2 +- lib/grack/bin/testserver | 1 - public/react/src/modules/page/component/TPICodeMirror.js | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 842249d6..43e9ef82 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -12,7 +12,7 @@ class CoursesController < ApplicationController helper :graduation_tasks include ApplicationHelper helper SyllabusesHelper - + # before_filter :auth_login1, :only => [:show, :course_activity, :feedback] if Redmine::Configuration['gitlab_address'].include?("test") skip_before_filter :verify_authenticity_token, :only => [:update_course_module, :join_course_multi_role] 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/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/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'); From a8d64e8f49be79e4fd9d4b8495d128d75d7681df Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 1 Mar 2019 11:27:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/grack/bin/console | 1 + lib/wechat/bin/wechat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/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) From ce12c48584a65fbeb75a336469ad6fa50455aad0 Mon Sep 17 00:00:00 2001 From: daiao <35855898@qq.com> Date: Fri, 1 Mar 2019 15:40:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f9354923a598b463f8149d53a8207eda01ebf110 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 1 Mar 2019 16:25:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AF=84=E6=B5=8B=E8=84=9A=E6=9C=AC=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/_settings_edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@

* -
+