ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign

Browse Source 
# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
This commit is contained in:
Christian Arenas 2017-06-02 16:34:37 +02:00
commit 1e3fd13362
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
View File

@ -9,7 +9,7 @@
using System.Collections.Generic; using System.Collections.Generic;
[Route("api/v1/[controller]")] [Route("api/v1/[controller]")]
//[Authorize] [Authorize]
public class CampaignsController : Controller public class CampaignsController : Controller
{ {
private readonly MarketingContext _context; private readonly MarketingContext _context;
@ -19,7 +19,6 @@
_context = context; _context = context;
} }
[HttpGet] [HttpGet]
public async Task<IActionResult> GetAllCampaigns() public async Task<IActionResult> GetAllCampaigns()
{ {

0
src/Services/Marketing/Marketing.API/Model/Campaing.cs → src/Services/Marketing/Marketing.API/Model/Campaign.cs
View File