Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
This commit is contained in:
commit
1448c4f90e
|
@ -25,7 +25,7 @@ else{
|
|||
indentUnit: 2,
|
||||
matchBrackets: true,
|
||||
readOnly: true,
|
||||
value: document.getElementById("work-src").innerText
|
||||
value: $("#work-src").text()
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
@ -62,6 +62,9 @@ RedmineApp::Application.routes.draw do
|
|||
end
|
||||
end
|
||||
|
||||
get '/', to: 'organizations#show', defaults: { id: 5 }, constraints: {subdomain: 'micros'}
|
||||
get '/', to: 'organizations#show', defaults: { id: 23 }, constraints: {subdomain: 'nubot'}
|
||||
|
||||
resources :org_member do
|
||||
member do
|
||||
|
||||
|
|
Loading…
Reference in New Issue