Merge branch 'develop' into educoder

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

app/views/shixuns/_settings_edit.html.erb

@@ -106,7 +106,7 @@
       </p>
       <div class="clearfix mb20 df">
         <span class="mr30 color-orange pt10 fl">*</span>
-        <div class="flex1">
+        <div class="flex1" style="width: 0">
           <div class="edu-back-greyf5 padding10">
             <textarea class="" id="shixun_script" name="shixun[evaluate_script]"><%= @shixun.evaluate_script %></textarea>
           </div>

lib/gitlab-cli/bin/gitlab

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+#
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'gitlab/cli'

lib/grack/bin/console

@@ -1,5 +1,6 @@
 #! /bin/bash
 
+###
 set -e
 
 cd $(dirname "$0")/..

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' ) )

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)
 

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');