Skip to content

Commit 7179964

Browse files
binonbinon
authored
Merge pull request #261 from TechnologyEnhancedLearning/RC
Rc
2 parents 8e6fc6c + 93eefb5 commit 7179964

File tree

1,265 files changed

+4209
-6583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,265 files changed

+4209
-6583
lines changed

‎.github/azure-pipeline-database-ci.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
trigger:
22
branches:
3-
include:
4-
- CI
3+
exclude:
4+
- '*'
5+
6+
pr:
7+
branches:
8+
exclude:
9+
- '*'
10+
511
resources:
612
repositories:
713
- repository: self
@@ -12,6 +18,7 @@ jobs:
1218
displayName: Agent job
1319
pool:
1420
vmImage: windows-2019
21+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/CI'))
1522
steps:
1623
- checkout: self
1724
clean: true

‎.github/azure-pipeline-openapi-reportapi-ci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ trigger:
88
branches:
99
include:
1010
- CI
11+
exclude:
12+
- '*'
1113
name: $(date:yyyyMMdd)$(rev:.r)
1214
resources:
1315
repositories:
1416
- repository: self
1517
type: git
16-
ref: refs/heads/RC
18+
ref: refs/heads/CI
1719
jobs:
1820
- job: Job_1
1921
displayName: Agent job

‎.github/azure-pipeline-webui-ci.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ variables:
44
value: '**/*.csproj'
55
- name: BuildParameters.TestProjects
66
value: '**/*[Tt]ests/*.csproj'
7-
trigger:
8-
branches:
9-
include:
10-
- CI
7+
# Triggered Via Azure pipeline
118
name: $(date:yyyyMMdd)$(rev:.r)
129
resources:
1310
repositories:

‎AdminUI/LearningHub.Nhs.AdminUI/Configuration/FileUploadSettingsModel.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="FileUploadSettingsModel.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Configuration
1+
namespace LearningHub.Nhs.AdminUI.Configuration
62
{
73
/// <summary>
84
/// Defines the <see cref="FileUploadSettingsModel" />.

‎AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="WebSettings.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Configuration
1+
namespace LearningHub.Nhs.AdminUI.Configuration
62
{
73
using System;
84

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/AuthorisationController.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="AuthorisationController.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Controllers
1+
namespace LearningHub.Nhs.AdminUI.Controllers
62
{
73
using Microsoft.AspNetCore.Mvc;
84

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="BaseController.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Controllers
1+
namespace LearningHub.Nhs.AdminUI.Controllers
62
{
73
using Microsoft.AspNetCore.Authorization;
84
using Microsoft.AspNetCore.Hosting;

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="CacheController.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Controllers
1+
namespace LearningHub.Nhs.AdminUI.Controllers
62
{
73
using System.Threading.Tasks;
84
using LearningHub.Nhs.AdminUI.Interfaces;

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="CatalogueController.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Controllers
1+
namespace LearningHub.Nhs.AdminUI.Controllers
62
{
73
using System;
84
using System.Collections.Generic;

‎AdminUI/LearningHub.Nhs.AdminUI/Controllers/CmsController.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// <copyright file="CmsController.cs" company="HEE.nhs.uk">
2-
// Copyright (c) HEE.nhs.uk.
3-
// </copyright>
4-
5-
namespace LearningHub.Nhs.AdminUI.Controllers
1+
namespace LearningHub.Nhs.AdminUI.Controllers
62
{
73
using System.Threading.Tasks;
84
using Microsoft.AspNetCore.Hosting;

0 commit comments

Comments
 (0)