Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

app/controllers/shixuns_controller.rb

@@ -305,7 +305,8 @@ class ShixunsController < ApplicationController
       rep = Repository.new(:myshixun_id => myshixun.id, :identifier => gshixun.name,:project_id => -1, :shixun_id => -2)
       rep.type = "Repository::Gitlab"
       rep.save!
-      rep_url = Base64.encode64(git_repository_url(myshixun, "Myshixun"))
+      login = User.find_by_mail("educoder@163.com").try(:login)
+      rep_url = Base64.encode64(git_shixun_url shixun, login)
       uri = URI("#{jenkins_shixuns}/jenkins-exec/game/openGameInstance")
       pipeLine = "#{shixun.script}"
       params = {jobNameForInstance: "myshixun_#{myshixun.id}", gamePipelineScript: pipeLine, instanceGitURL:rep_url}

app/views/layouts/base_myshixun.html.erb

@@ -9,7 +9,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common', 'css/font-awesome','css/taskstyle','css/structure','scm','css/public', 'css/project','css/popup','repository','css/gantt', 'css/calendar', 'css/moduel', 'css/cssPlus-v.0.2-build', 'css/edu-common','css/edu-public', 'css/edu-popup', 'css/edu-tooltipster' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/font-awesome','css/taskstyle', 'css/project','css/popup','repository','css/gantt','css/cssPlus-v.0.2-build', 'css/edu-common','css/edu-public', 'css/edu-popup', 'css/edu-tooltipster' %>
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>

config/initializers/session_store.rb

@@ -1 +1 @@
-Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 90.minutes, :key => '_trustie_session', :domain => :all
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 90.minutes, :key => '_educoder_session', :domain => :all