Skip to content
Browse files

Merge remote-tracking branch 'refs/remotes/origin/dev'

  • Loading branch information...
2 parents cd8c0e1 + a93ac3b commit 9f384ae737de79fa9d98400befa877a9657ca494 @maartenba maartenba committed Apr 28, 2016
View
2 src/NuGetGallery/App_Data/Files/Content/Home.html
@@ -5,7 +5,7 @@
<a class="install" href="https://dist.nuget.org/visualstudio-2015-vsix/latest/NuGet.Tools.vsix"><i class="icon-download-alt icon-white"></i> Install NuGet</a>
<div class="downloads">
<a href="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe">latest nuget.exe</a> -
- <a href="https://dist.nuget.org/index.html">all downloads</a> -
+ <a href="/downloads">all downloads</a> -
<a href="https://docs.nuget.org/docs/start-here/installing-nuget" target="_blank">documentation</a>
</div>
</div>
View
5 src/NuGetGallery/App_Start/Routes.cs
@@ -269,6 +269,11 @@ public static void RegisterUIRoutes(RouteCollection routes)
"curated-feeds/{curatedFeedName}/curated-packages",
new { controller = "CuratedPackages", action = "CuratedPackages" });
+ routes.MapRoute(
+ RouteName.Downloads,
+ "downloads",
+ new { controller = "Pages", action = "Downloads" });
+
// TODO : Most of the routes are essentially of the format api/v{x}/*. We should refactor the code to vary them by the version.
// V1 Routes
// If the push url is /api/v1 then NuGet.Core would ping the path to resolve redirection.
View
4 src/NuGetGallery/Controllers/PackagesController.cs
@@ -326,6 +326,10 @@ public virtual ActionResult UploadPackageProgress()
var searchFilter = SearchAdaptor.GetSearchFilter(
"id:\"" + package.PackageRegistration.Id + "\" AND version:\"" + package.Version + "\"",
1, null, SearchFilter.ODataSearchContext);
+
+ searchFilter.IncludePrerelease = true;
+ searchFilter.IncludeAllVersions = true;
+
var results = await externalSearchService.RawSearch(searchFilter);
isIndexed = results.Hits > 0;
View
5 src/NuGetGallery/Controllers/PagesController.cs
@@ -51,6 +51,11 @@ public virtual ActionResult Contact()
return View();
}
+ public virtual ActionResult Downloads()
+ {
+ return Redirect("https://dist.nuget.org/index.html");
+ }
+
[Authorize]
[HttpPost]
public virtual async Task<ActionResult> Contact(ContactSupportViewModel contactForm)
View
1 src/NuGetGallery/RouteNames.cs
@@ -66,5 +66,6 @@ public static class RouteName
public const string Contributors = "Contributors";
public const string Team = "Team";
public const string JsonApi = "JsonApi";
+ public const string Downloads = "Downloads";
}
}
View
2 src/NuGetGallery/Views/Shared/SiteMenu.cshtml
@@ -19,6 +19,6 @@
<li class="@classes["Admin"]"><a href="@Url.Action("Index", "Home", new { area="Admin" })">Admin</a></li>
}
<li><a href="https://docs.nuget.org">Documentation</a></li>
- <li><a href="https://dist.nuget.org/index.html">Downloads</a></li>
+ <li><a href="/downloads">Downloads</a></li>
<li><a href="http://blog.nuget.org">Blog</a></li>
</ul>
View
5 src/NuGetGallery/WebApi/QueryResult.cs
@@ -66,7 +66,10 @@ public QueryResult(ODataQueryOptions<TModel> queryOptions, IQueryable<TModel> qu
// todo: if we decide to no longer support projections
//AllowedQueryOptions = AllowedQueryOptions.All & ~AllowedQugeteryOptions.Select
- _validationSettings = new ODataValidationSettings();
+ _validationSettings = new ODataValidationSettings()
+ {
+ MaxNodeCount = 250
+ };
_querySettings = new ODataQuerySettings(QueryResultDefaults.DefaultQuerySettings)
{

0 comments on commit 9f384ae

Please sign in to comment.
Something went wrong with that request. Please try again.