From bdf144eed44fcf25b9c70410b671641f8c77be1f Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 May 2017 15:19:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?tpi=20css=E5=8A=A0=E8=BD=BD=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_myshixun.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index 4d5e7c467..0a831d8aa 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/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 %> <%= yield :header_tags -%> From 871051fdc121adc0c60b2d0255cf358d6666d843 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 May 2017 15:57:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=89=88=E6=9C=ACsession=E4=B8=80=E8=87=B4=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=90=8E=E7=99=BB=E5=BD=95=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/session_store.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 1d3a65f8b..8be321fdf 100644 --- a/config/initializers/session_store.rb +++ b/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 From 24da90d900f191e71d3e04b8d1e24e8165ddafc0 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 11 May 2017 16:24:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 764a18f75..c539ef487 100644 --- a/app/controllers/shixuns_controller.rb +++ b/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}