prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3982 commits 4 branches 0 tags 169 MiB
Commit graph

3982 commits

This branch
This branch
All branches
Author SHA1 Message Date
Azure Pipelines EF Migration Bot
97e5d49e12 migrate PR #1370 2020-02-16 23:08:40 +00:00
Azure Pipelines EF Migration Bot
7083b4f3f3 Merge remote-tracking branch 'upstream/master' into migrate 2020-02-16 23:08:14 +00:00
Azure Pipelines EF Migration Bot
db1e6f6bfb Revert "migrate PR #1370" 
This reverts commit 3e3c610486.
 2020-02-16 23:08:13 +00:00
Collin M. Barrett
e47786d919 trigger migrate 2020-02-16 17:06:39 -06:00
Collin M. Barrett
02a4897f11 TEMP (REVERT ME) test upstream sync 2020-02-16 17:05:57 -06:00
Collin M. Barrett
b304b87b52 Revert "TEMP (REVERT ME) test conflict in migrate" 
This reverts commit 1cf7e06ada.
 2020-02-16 17:05:25 -06:00
Collin M. Barrett
f55e906882 Merge branch 'migrate' of https://github.com/collinbarrett/FilterLists into migrate 2020-02-16 17:03:19 -06:00
Collin M. Barrett
16cfdc540d test migrate conflict 2020-02-16 17:03:00 -06:00
Collin M. Barrett
1cf7e06ada TEMP (REVERT ME) test conflict in migrate 2020-02-16 17:02:27 -06:00
Azure Pipelines EF Migration Bot
3e3c610486 migrate PR #1370 2020-02-16 22:28:54 +00:00
Azure Pipelines EF Migration Bot
bada62ad31 Revert "migrate PR #1370" 
This reverts commit 9e5e8571f9.
 2020-02-16 22:28:31 +00:00
Collin M. Barrett
dc05bbf3d4 re-add graceful exits 2020-02-16 16:26:47 -06:00
Azure Pipelines EF Migration Bot
9e5e8571f9 migrate PR #1370 2020-02-16 21:59:34 +00:00
Collin M. Barrett
d36f115465 try fix sync with upstream overriding local changes 2020-02-16 15:57:44 -06:00
Azure Pipelines EF Migration Bot
c4906929e5 merge upstream data 2020-02-16 21:52:36 +00:00
Collin M. Barrett
40d534625d try fix sync with upstream overriding local changes 2020-02-16 15:51:08 -06:00
Collin M. Barrett
3810ff06ff try fix sync with upstream overriding local changes 2020-02-16 15:41:09 -06:00
Azure Pipelines EF Migration Bot
e8f6aac40b merge upstream data 2020-02-16 19:22:05 +00:00
Collin M. Barrett
aeaa199b1a Merge branch 'migrate' of https://github.com/collinbarrett/FilterLists into migrate 2020-02-16 13:20:41 -06:00
Collin M. Barrett
12fed211e7 try fix sync with upstream overriding local changes 2020-02-16 13:20:31 -06:00
Azure Pipelines EF Migration Bot
9c072c60d2 merge upstream data 2020-02-16 19:16:51 +00:00
Collin M. Barrett
bd549c9f4d try fix sync with upstream overriding local changes 2020-02-16 13:15:20 -06:00
Azure Pipelines EF Migration Bot
02d53fcbbf merge upstream data 2020-02-16 19:05:12 +00:00
Collin M. Barrett
4423a5934d scrap breaking out into jobs 2020-02-16 13:03:27 -06:00
Collin M. Barrett
8c02db18dd try using skip ci to avoid re-migrating 2020-02-16 12:56:07 -06:00
Collin M. Barrett
4552163cbb specify targetType for Bash tasks 2020-02-16 12:51:51 -06:00
Collin M. Barrett
47f9b70f57 Revert "try fixing directory" 
This reverts commit 4f07a1cc43.
 2020-02-15 19:41:37 -06:00
Collin M. Barrett
4f07a1cc43 try fixing directory 2020-02-15 19:40:18 -06:00
Collin M. Barrett
ad2fe9290e add TODO 2020-02-15 19:33:35 -06:00
Collin M. Barrett
9c8d30deca Push dependsOn TestMigration 2020-02-15 19:14:55 -06:00
Collin M. Barrett
57b490a22a REMP (REMOVE ME) trigger migrate 2020-02-15 19:13:04 -06:00
Collin M. Barrett
0b10268ad0 break migrate into Jobs 2020-02-15 19:12:37 -06:00
Azure Pipelines EF Migration Bot
397ee7f19b Revert "migrate PR #1369" 
This reverts commit d1c84f263e.
 2020-02-15 17:53:14 +00:00
Collin M. Barrett
b235af1ebd only commit from upstream on change to avoid error-ing, add TODO for JSON linting 2020-02-15 17:53:14 +00:00
Collin M. Barrett
191dffbcbe abandon migration before integration test if no-op 2020-02-15 17:53:14 +00:00
Collin M. Barrett
508023977e run data integration test before pushing migration 2020-02-15 17:53:14 +00:00
Collin M. Barrett
f936396fed Revert "add conflict with master data" 
This reverts commit f8b263e359.
 2020-02-15 17:53:14 +00:00
Collin M. Barrett
297a11fd34 Revert "trigger migrate" 
This reverts commit 2f380b5f8e.
 2020-02-15 17:53:14 +00:00
Collin M. Barrett
a1bd45dc49 Revert "merge upstream data" 
This reverts commit 901309bccf.
 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
5999f05c3e migrate PR #1369 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
bff03c010a merge upstream data 2020-02-15 17:53:14 +00:00
Collin M. Barrett
76637a2585 trigger migrate 2020-02-15 17:53:14 +00:00
Collin M. Barrett
44d5015150 add conflict with master data 2020-02-15 17:53:14 +00:00
Collin M. Barrett
7a5415305f add upstream remote over https 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
e05ec9b824 merge upstream data 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
7885fc4d0c Revert "migrate PR #1369" 
This reverts commit 271a2139a4.
 2020-02-15 17:53:14 +00:00
Collin M. Barrett
617b7280f7 sync data with upstream before adding migration 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
d7bbded057 migrate PR #1369 2020-02-15 17:53:14 +00:00
Azure Pipelines EF Migration Bot
c558d98214 Revert "migrate PR #1369" 
This reverts commit 3be1d7b6cf.
 2020-02-15 17:53:14 +00:00
Collin M. Barrett
edc9c84953 get last migrate hash by author as well 2020-02-15 17:53:14 +00:00