Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/concerns/git_common.rb

@@ -47,7 +47,7 @@ module GitCommon
   def add_file
     @path, message, content = params[:path].strip, params[:message], params[:content]
     author_name, author_email = current_user.real_name, current_user.git_mail
-    Logger.info("...repo_path is #{@repo_path}")
+    Rails.logger.info(" good repo_name is #{@repo_path}")
     @content = GitService.update_file(repo_path: @repo_path,
                                       file_path: @path,
                                       message: message,

app/controllers/shixuns_controller.rb

@@ -13,7 +13,7 @@ class ShixunsController < ApplicationController
 	before_action :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns, :add_file,
 																								 :propaedeutics, :departments, :apply_shixun_mirror,
 																								 :get_mirror_script, :download_file]
-	before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy]
+	before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file]
 
 	before_action :allowed, only:  [:update, :close, :update_propaedeutics, :settings, :publish,
 																  :shixun_members_added, :change_manager, :collaborators_delete,

public/react/src/modules/courses/poll/PollNew.js

@@ -2455,7 +2455,7 @@ class PollNew extends Component {
 		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
 		var displaymysave = (mysave === true) ? "" : "display:none;";
 		return (
-			<div className="newMain">
+			<div>
 				{/*提示*/}
 				{Modalstype && Modalstype === true ? <Modals
 					modalsType={this.state.Modalstype}
@@ -2465,7 +2465,14 @@ class PollNew extends Component {
 					modalsBottomval={this.state.ModalsBottomval}
 					loadtype={this.state.Loadtype}
 				/> : ""}
-				<div className="educontent mb50">
+				<style>
+					{
+						`
+				.newMains{ margin: 0 auto; padding-bottom: 235px !important; min-width:1200px; min-height: 800px !important;}
+				`
+					}
+				</style>
+				<div className="educontent newMains">
 					<p className="clearfix mb20 mt10">
 						<a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>