Skip to content

Commit 7874298

Browse files
Merge pull request #7225 from NuGet/cmanu-master-to-dev
FI master to dev
2 parents 84d2914 + dfb4140 commit 7874298

4 files changed

Lines changed: 15 additions & 2 deletions

File tree

src/NuGetGallery/Controllers/ApiController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public virtual async Task<ActionResult> Status()
280280
[ActionName("HealthProbeApi")]
281281
public ActionResult HealthProbe()
282282
{
283-
return new HttpStatusCodeWithBodyResult(HttpStatusCode.OK, "Gallery is Available");
283+
return View();
284284
}
285285

286286
[HttpGet]

src/NuGetGallery/Migrations/201904292139301_RemoveVulnerabilityDataFromPackageDeprecationModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public override void Up()
1717
DropIndex("dbo.PackageDeprecationCves", new[] { "Cve_Key" });
1818
DropIndex("dbo.PackageDeprecationCwes", new[] { "PackageDeprecation_Key" });
1919
DropIndex("dbo.PackageDeprecationCwes", new[] { "Cwe_Key" });
20-
Sql("ALTER TABLE [dbo].[PackageDeprecations] DROP CONSTRAINT [dbo.PackageDeprecations_CVSSRating];");
20+
Sql("ALTER TABLE [dbo].[PackageDeprecations] DROP CONSTRAINT IF EXISTS [dbo.PackageDeprecations_CVSSRating];");
2121
DropColumn("dbo.PackageDeprecations", "CvssRating");
2222
DropTable("dbo.Cves");
2323
DropTable("dbo.Cwes");

src/NuGetGallery/NuGetGallery.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,7 @@
19311931
<Content Include="Views\Shared\_MultiSelectDropdown.cshtml" />
19321932
<Content Include="Views\Packages\_DisplayPackageDeprecation.cshtml" />
19331933
<Content Include="Views\Experiments\SearchSideBySide.cshtml" />
1934+
<Content Include="Views\Api\HealthProbeApi.cshtml" />
19341935
</ItemGroup>
19351936
<ItemGroup>
19361937
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<section role="main" class="container main-container">
2+
<div class="row">
3+
<div class="@ViewHelpers.GetColumnClasses(ViewBag)">
4+
<h1>
5+
Health Probe
6+
</h1>
7+
<p>
8+
Gallery is available.
9+
</p>
10+
</div>
11+
</div>
12+
</section>

0 commit comments

Comments
 (0)