Skip to content

Commit 2a9b726

Browse files
joelverhagenjoelverhagen
authored
Merge pull request #9210 from NuGet/dev
Merge branch "dev" into main
2 parents ed43f93 + 7c0f54d commit 2a9b726

31 files changed

Lines changed: 199 additions & 295 deletions

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# on specific relative paths.
66
**/Scripts/gallery/jquery-3.4.1.js
77
**/Scripts/gallery/knockout-3.5.1.js
8-
**/Scripts/gallery/moment-2.29.2.js
8+
**/Scripts/gallery/moment-2.29.4.js

‎NuGetGallery.sln.DotSettings‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Bootstrap/dist/css/bootstrap-theme.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Bootstrap/less/theme/page-display-package.less‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,28 @@
4242
margin-right: 12px;
4343
}
4444

45-
.prefix-reserve-title {
46-
background-color: #F3F2F1;
47-
display: inline-flex;
48-
align-items: center;
49-
border-radius: 100px;
50-
vertical-align: middle;
45+
}
5146

52-
.reserved-indicator {
53-
width: 18px;
54-
margin-right: 5px;
55-
margin-left: 2px;
56-
}
47+
.prefix-reserve-title {
48+
background-color: #F3F2F1;
49+
display: inline-flex;
50+
align-items: center;
51+
border-radius: 100px;
52+
vertical-align: middle;
5753

58-
.prefix-reserve-label {
59-
font-size: 14px;
60-
font-weight: 400;
61-
color: #2F6FA7;
62-
margin-top: 2px;
63-
margin-bottom: 2px;
64-
margin-right: 10px;
65-
}
54+
.reserved-indicator {
55+
width: 18px;
56+
margin-right: 5px;
57+
margin-left: 2px;
58+
}
59+
60+
.prefix-reserve-label {
61+
font-size: 14px;
62+
font-weight: 400;
63+
color: #2F6FA7;
64+
margin-top: 2px;
65+
margin-bottom: 2px;
66+
margin-right: 10px;
6667
}
6768
}
6869

‎src/DatabaseMigrationTools/DatabaseMigrationTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<PrivateAssets>all</PrivateAssets>
6666
</PackageReference>
6767
<PackageReference Include="NuGet.Services.Validation">
68-
<Version>2.104.0</Version>
68+
<Version>2.105.0</Version>
6969
</PackageReference>
7070
</ItemGroup>
7171
<ItemGroup>

‎src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Version>4.3.0-dev-5590084</Version>
9292
</PackageReference>
9393
<PackageReference Include="NuGet.Services.Cursor">
94-
<Version>2.104.0</Version>
94+
<Version>2.105.0</Version>
9595
</PackageReference>
9696
</ItemGroup>
9797
<ItemGroup>

‎src/NuGetGallery.Core/NuGetGallery.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Version>6.0.0</Version>
5151
</PackageReference>
5252
<PackageReference Include="NuGet.Services.FeatureFlags">
53-
<Version>2.104.0</Version>
53+
<Version>2.105.0</Version>
5454
</PackageReference>
5555
<PackageReference Include="WindowsAzure.Storage">
5656
<Version>9.3.3</Version>
@@ -59,13 +59,13 @@
5959

6060
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
6161
<PackageReference Include="NuGet.Services.Messaging.Email">
62-
<Version>2.104.0</Version>
62+
<Version>2.105.0</Version>
6363
</PackageReference>
6464
<PackageReference Include="NuGet.Services.Validation">
65-
<Version>2.104.0</Version>
65+
<Version>2.105.0</Version>
6666
</PackageReference>
6767
<PackageReference Include="NuGet.Services.Validation.Issues">
68-
<Version>2.104.0</Version>
68+
<Version>2.105.0</Version>
6969
</PackageReference>
7070
<PackageReference Include="NuGet.StrongName.elmah.corelibrary">
7171
<Version>1.2.2</Version>

‎src/NuGetGallery.Services/NuGetGallery.Services.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,14 @@
8484
<PackageReference Include="Microsoft.Owin.Security.OpenIdConnect">
8585
<Version>4.1.0</Version>
8686
</PackageReference>
87-
<PackageReference Include="NuGet.Packaging">
88-
<Version>6.0.0</Version>
89-
</PackageReference>
9087
<PackageReference Include="NuGet.Protocol">
9188
<Version>6.0.0</Version>
9289
</PackageReference>
9390
<PackageReference Include="NuGet.Services.Configuration">
94-
<Version>2.104.0</Version>
91+
<Version>2.105.0</Version>
9592
</PackageReference>
9693
<PackageReference Include="NuGet.Services.Logging">
97-
<Version>2.104.0</Version>
94+
<Version>2.105.0</Version>
9895
</PackageReference>
9996
<PackageReference Include="NuGet.StrongName.WebBackgrounder">
10097
<Version>0.2.0</Version>

‎src/NuGetGallery/App_Data/Files/Content/Trusted-Image-Domains.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"api.dependabot.com",
88
"api.travis-ci.com",
99
"api.travis-ci.org",
10+
"api.reuse.software",
1011
"app.fossa.io",
1112
"app.fossa.com",
1213
"badge.fury.io",

‎src/NuGetGallery/App_Start/AppActivator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private static void BundlingPostStart()
134134
.Include("~/Scripts/gallery/jquery.validate.unobtrusive-3.2.6.js")
135135
.Include("~/Scripts/gallery/knockout-3.5.1.js")
136136
.Include("~/Scripts/gallery/bootstrap.js")
137-
.Include("~/Scripts/gallery/moment-2.29.2.js")
137+
.Include("~/Scripts/gallery/moment-2.29.4.js")
138138
.Include("~/Scripts/gallery/common.js")
139139
.Include("~/Scripts/gallery/autocomplete.js");
140140
BundleTable.Bundles.Add(scriptBundle);

0 commit comments

Comments
 (0)