codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 10:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-03-23 17:01:46 -07:00
commit 56581cfc96
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/editor/ForkModal.coffee
View file

@ -28,6 +28,8 @@ module.exports = class ForkModal extends ModalView
newModel.unset 'created' newModel.unset 'created'
newModel.unset 'original' newModel.unset 'original'
newModel.unset 'parent' newModel.unset 'parent'
newModel.unset 'i18n'
newModel.unset 'i18nCoverage'
newModel.set 'commitMessage', "Forked from #{@model.get('name')}" newModel.set 'commitMessage', "Forked from #{@model.get('name')}"
newModel.set 'name', @$el.find('#fork-model-name').val() newModel.set 'name', @$el.find('#fork-model-name').val()
if @model.schema().properties.permissions if @model.schema().properties.permissions

2
server_setup.coffee
View file

@ -86,7 +86,7 @@ setupChinaRedirectMiddleware = (app) ->
geo = geoip.lookup(ip) geo = geoip.lookup(ip)
return geo?.country is "CN" and speaksChinese return geo?.country is "CN" and speaksChinese
else else
req.chinaVersion = true req.chinaVersion = true if speaksChinese
return false # If the user is already redirected, don't redirect them! return false # If the user is already redirected, don't redirect them!
app.use (req, res, next) -> app.use (req, res, next) ->