Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

texjs-web
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

a2536976

Commit a2536976 authored Nov 25, 2014 by Henry Oswald

Downloads
- Plain Diff

Merge branch 'master' into multicurrency

parents 27fe17b3 5228e18c

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

app/coffee/Features/Blog/BlogController.coffee 5 additions, 1 deletion

app/coffee/Features/Blog/BlogController.coffee
app/coffee/Features/Editor/EditorController.coffee 1 addition, 0 deletions

app/coffee/Features/Editor/EditorController.coffee
app/coffee/Features/HealthCheck/HealthCheckController.coffee 11 additions, 8 deletions

app/coffee/Features/HealthCheck/HealthCheckController.coffee
app/coffee/Features/StaticPages/UniversityController.coffee 4 additions, 1 deletion

app/coffee/Features/StaticPages/UniversityController.coffee
app/coffee/Features/Templates/TemplatesController.coffee 4 additions, 1 deletion

app/coffee/Features/Templates/TemplatesController.coffee
app/coffee/Features/Uploads/FileTypeManager.coffee 2 additions, 1 deletion

app/coffee/Features/Uploads/FileTypeManager.coffee
app/coffee/infrastructure/OldAssetProxy.coffee 4 additions, 1 deletion

app/coffee/infrastructure/OldAssetProxy.coffee
test/UnitTests/coffee/Templates/TemplatesControllerTests.coffee 4 additions, 1 deletion

...nitTests/coffee/Templates/TemplatesControllerTests.coffee
test/smoke/coffee/SmokeTests.coffee 1 addition, 0 deletions

test/smoke/coffee/SmokeTests.coffee

with 36 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment