From cfb3969b88f3077c8ebb265eb213b907b2641174 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 13 Oct 2014 14:45:45 +0100 Subject: [PATCH 1/4] Fix alignment in left menu --- services/web/app/views/project/editor/left-menu.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/left-menu.jade b/services/web/app/views/project/editor/left-menu.jade index af5edf2686..7505f6a2b8 100644 --- a/services/web/app/views/project/editor/left-menu.jade +++ b/services/web/app/views/project/editor/left-menu.jade @@ -40,7 +40,7 @@ aside#left-menu.full-size( ng-click="openCloneProjectModal()" ) i.fa.fa-fw.fa-copy - |   #{translate("copy_project")} + |    #{translate("copy_project")} li(ng-controller="TemplatesController", ng-show="permissions.admin") a(ng-click="openPublishTemplateModal()") i.fa.fa-external-link.fa-fw From 5edefe249839e74ae6373fa5e662f54f150bc8e8 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 13 Oct 2014 15:42:11 +0100 Subject: [PATCH 2/4] Add in compile timeout and group feature options --- services/web/app/coffee/models/User.coffee | 2 ++ services/web/config/settings.defaults.coffee | 2 ++ 2 files changed, 4 insertions(+) diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee index 7e11f3bc18..04cde26198 100644 --- a/services/web/app/coffee/models/User.coffee +++ b/services/web/app/coffee/models/User.coffee @@ -31,6 +31,8 @@ UserSchema = new Schema collaborators: { type:Number, default: Settings.defaultFeatures.collaborators } versioning: { type:Boolean, default: Settings.defaultFeatures.versioning } dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox } + compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout } + compileGroup: { type:String, default: Settings.defaultFeatures.compileGroup } } featureSwitches : { github: {type: Boolean} diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index b742123720..4d0a38298a 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -130,6 +130,8 @@ module.exports = collaborators: -1 dropbox: true versioning: true + compileTimeout: 60 + compileGroup: "standard" plans: plans = [{ planCode: "personal" From 3c058edfb441f870d9c03a9798f5bdb791ddf249 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 13 Oct 2014 15:45:19 +0100 Subject: [PATCH 3/4] Add github feature flag to user model --- services/web/app/coffee/models/User.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee index 04cde26198..f7770fca22 100644 --- a/services/web/app/coffee/models/User.coffee +++ b/services/web/app/coffee/models/User.coffee @@ -31,6 +31,7 @@ UserSchema = new Schema collaborators: { type:Number, default: Settings.defaultFeatures.collaborators } versioning: { type:Boolean, default: Settings.defaultFeatures.versioning } dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox } + github: { type:Boolean, default: Settings.defaultFeatures.github } compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout } compileGroup: { type:String, default: Settings.defaultFeatures.compileGroup } } From 3bac4dc39fc7e6d80eac5d30f11791bcb7cae4a5 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 14 Oct 2014 11:50:06 +0100 Subject: [PATCH 4/4] increase auto compile limit --- services/web/app/coffee/Features/Compile/CompileManager.coffee | 2 +- .../test/UnitTests/coffee/Compile/CompileManagerTests.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Compile/CompileManager.coffee b/services/web/app/coffee/Features/Compile/CompileManager.coffee index ff3468b1f3..870ad14d6c 100755 --- a/services/web/app/coffee/Features/Compile/CompileManager.coffee +++ b/services/web/app/coffee/Features/Compile/CompileManager.coffee @@ -60,7 +60,7 @@ module.exports = CompileManager = endpointName:"auto_compile" timeInterval:15 subjectName:"everyone" - throttle: 10 + throttle: 15 rateLimiter.addCount opts, (err, canCompile)-> if err? canCompile = false diff --git a/services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee b/services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee index 8b6149eaa8..7e3a0b2f91 100644 --- a/services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee +++ b/services/web/test/UnitTests/coffee/Compile/CompileManagerTests.coffee @@ -201,7 +201,7 @@ describe "CompileManager", -> @ratelimiter.addCount.callsArgWith(1, null, true) @CompileManager._checkIfAutoCompileLimitHasBeenHit true, (err, canCompile)=> args = @ratelimiter.addCount.args[0][0] - args.throttle.should.equal 10 + args.throttle.should.equal 15 args.subjectName.should.equal "everyone" args.timeInterval.should.equal 15 args.endpointName.should.equal "auto_compile"