Commit Graph

Select branches

Hide Pull Requests

bugfix/issue-704

bugfix/issue-910

bugfix/issue-997

dependabot/npm_and_yarn/brace-expansion-1.1.12

dependabot/npm_and_yarn/cipher-base-1.0.6

dependabot/npm_and_yarn/koa-2.16.2

dependabot/npm_and_yarn/min-document-2.19.2

dependabot/npm_and_yarn/node-forge-1.3.3

dependabot/npm_and_yarn/pbkdf2-3.1.5

dependabot/npm_and_yarn/sha.js-2.4.12

dependabot/npm_and_yarn/tar-6.2.1

dependabot/npm_and_yarn/tmp-0.2.5

dependabot/npm_and_yarn/webpack-dev-server-5.2.1

develop

feature/agpl

feature/compute_rename

feature/consolidate_permission_checks

feature/filetree_file_status_icon

feature/mermaid

github/2247

main

pfeuffer/POC_hg_merge

snyk-fix-33881e311dc6a99e289a7d67aef4c8ee

snyk-fix-47e67696a7d6d2f94659254d8966870d

snyk-fix-6439a48705f2a4beb0cf012557534ebb

snyk-fix-81956b290fb3c6e17929fff413f219bd

snyk-fix-a1ff40c306e7526007dbe328a3602ce7

snyk-fix-a22a7b2a42b46f12a674cfa3c088b17b

snyk-fix-dc86e1012bcea438c87218dbf27c80b8

snyk-fix-e760820f8ef19b7e96c317e64996fcf2

snyk-fix-fe72bb11faf6369274ece868d9246878

snyk-upgrade-8ce77d732017cf06fd97bb3f46151c1f

support/1.x

support/2.12.x

support/2.48.x

support/3.4.x

support/3.6.x

support/3.7.x

#1031

#1032

#1033

#1034

#1036

#1037

#1038

#1039

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1050

#1051

#1052

#1053

#1055

#1056

#1057

#1058

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1068

#1069

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1096

#1097

#1098

#1099

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#1111

#1112

#1114

#1115

#1116

#1117

#1118

#1119

#1120

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#1129

#1133

#1134

#1135

#1136

#1137

#1138

#1140

#1141

#1142

#1143

#1144

#1145

#1146

#1147

#1148

#1149

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#1160

#1161

#1162

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#1170

#1171

#1172

#1174

#1175

#1176

#1178

#1180

#1182

#1183

#1184

#1185

#1186

#1187

#1189

#1191

#1192

#1196

#1199

#1200

#1201

#1202

#1203

#1204

#1206

#1207

#1208

#1209

#1210

#1212

#1213

#1215

#1217

#1218

#1220

#1221

#1226

#1227

#1229

#1230

#1231

#1232

#1233

#1234

#1239

#1240

#1242

#1243

#1244

#1245

#1246

#1247

#1248

#1249

#1251

#1254

#1255

#1256

#1257

#1258

#1259

#1260

#1261

#1262

#1264

#1265

#1267

#1271

#1273

#1275

#1276

#1277

#1278

#1279

#1282

#1283

#1284

#1285

#1286

#1287

#1288

#1289

#1290

#1291

#1293

#1294

#1295

#1296

#1297

#1298

#1299

#1300

#1301

#1303

#1304

#1305

#1306

#1307

#1308

#1309

#1310

#1311

#1312

#1313

#1314

#1315

#1316

#1317

#1318

#1319

#1320

#1321

#1322

#1323

#1324

#1325

#1326

#1327

#1328

#1329

#1330

#1331

#1332

#1333

#1334

#1335

#1336

#1337

#1338

#1339

#1340

#1341

#1342

#1343

#1344

#1345

#1346

#1347

#1348

#1349

#1350

#1351

#1352

#1353

#1355

#1357

#1358

#1359

#1360

#1361

#1362

#1363

#1364

#1366

#1368

#1369

#1370

#1371

#1373

#1374

#1375

#1376

#1377

#1378

#1379

#1380

#1382

#1383

#1384

#1385

#1386

#1387

#1388

#1389

#1390

#1393

#1395

#1396

#1397

#1398

#1399

#1400

#1402

#1403

#1404

#1405

#1406

#1407

#1408

#1409

#1410

#1411

#1412

#1413

#1414

#1415

#1416

#1417

#1418

#1420

#1421

#1422

#1423

#1424

#1427

#1429

#1430

#1431

#1432

#1433

#1434

#1435

#1436

#1437

#1438

#1439

#1440

#1441

#1442

#1443

#1444

#1447

#1450

#1451

#1452

#1453

#1454

#1455

#1456

#1457

#1458

#1459

#1460

#1461

#1462

#1463

#1464

#1465

#1466

#1470

#1471

#1472

#1473

#1474

#1476

#1477

#1478

#1479

#1480

#1481

#1482

#1483

#1484

#1485

#1486

#1488

#1489

#1490

#1491

#1492

#1494

#1495

#1496

#1497

#1498

#1499

#1500

#1501

#1502

#1503

#1504

#1505

#1506

#1507

#1508

#1509

#1510

#1511

#1512

#1514

#1515

#1516

#1517

#1518

#1519

#1520

#1521

#1522

#1523

#1524

#1526

#1527

#1528

#1530

#1531

#1532

#1533

#1534

#1535

#1536

#1537

#1538

#1539

#1540

#1541

#1542

#1543

#1544

#1545

#1546

#1547

#1549

#1550

#1551

#1552

#1553

#1554

#1555

#1556

#1558

#1559

#1561

#1562

#1563

#1564

#1565

#1566

#1567

#1568

#1569

#1570

#1571

#1572

#1573

#1574

#1576

#1578

#1579

#1581

#1582

#1583

#1584

#1585

#1586

#1588

#1589

#1590

#1591

#1592

#1594

#1595

#1596

#1597

#1598

#1600

#1601

#1602

#1603

#1604

#1605

#1606

#1607

#1608

#1609

#1610

#1611

#1612

#1613

#1614

#1615

#1616

#1618

#1620

#1621

#1622

#1623

#1625

#1626

#1627

#1628

#1629

#1630

#1631

#1633

#1634

#1636

#1637

#1638

#1639

#1643

#1645

#1646

#1647

#1650

#1651

#1652

#1653

#1654

#1655

#1656

#1657

#1658

#1659

#1660

#1661

#1662

#1663

#1664

#1667

#1669

#1670

#1671

#1673

#1674

#1675

#1676

#1677

#1678

#1679

#1680

#1681

#1682

#1683

#1686

#1687

#1688

#1689

#1691

#1692

#1693

#1694

#1696

#1697

#1698

#1699

#1700

#1701

#1703

#1704

#1705

#1707

#1708

#1709

#1710

#1711

#1712

#1713

#1714

#1715

#1716

#1717

#1718

#1720

#1721

#1722

#1727

#1728

#1731

#1732

#1733

#1734

#1735

#1736

#1737

#1738

#1739

#1740

#1741

#1745

#1746

#1747

#1748

#1749

#1750

#1752

#1753

#1754

#1755

#1756

#1757

#1758

#1759

#1760

#1761

#1762

#1763

#1764

#1765

#1767

#1768

#1769

#1770

#1773

#1775

#1776

#1777

#1778

#1779

#1780

#1781

#1783

#1784

#1785

#1787

#1788

#1789

#1790

#1792

#1793

#1794

#1795

#1796

#1797

#1798

#1800

#1801

#1803

#1804

#1805

#1806

#1807

#1809

#1810

#1811

#1812

#1813

#1814

#1815

#1816

#1818

#1819

#1820

#1821

#1822

#1823

#1824

#1825

#1826

#1827

#1828

#1831

#1832

#1833

#1834

#1836

#1837

#1838

#1839

#1840

#1841

#1842

#1843

#1844

#1845

#1847

#1848

#1849

#1850

#1851

#1852

#1853

#1854

#1855

#1856

#1857

#1858

#1859

#1860

#1861

#1865

#1866

#1867

#1868

#1869

#1870

#1871

#1872

#1873

#1874

#1875

#1876

#1877

#1878

#1879

#1880

#1881

#1882

#1883

#1884

#1885

#1886

#1887

#1888

#1889

#1890

#1891

#1892

#1893

#1894

#1896

#1897

#1898

#1900

#1901

#1902

#1903

#1904

#1905

#1906

#1907

#1908

#1910

#1912

#1913

#1915

#1916

#1917

#1918

#1919

#1920

#1921

#1922

#1923

#1924

#1925

#1926

#1927

#1928

#1929

#1930

#1931

#1932

#1933

#1934

#1935

#1936

#1937

#1938

#1939

#1940

#1941

#1942

#1944

#1945

#1946

#1947

#1948

#1949

#1950

#1951

#1952

#1953

#1954

#1955

#1956

#1957

#1959

#1962

#1963

#1965

#1966

#1967

#1968

#1969

#1970

#1971

#1972

#1973

#1974

#1975

#1976

#1977

#1978

#1980

#1982

#1983

#1984

#1985

#1987

#1988

#1989

#1990

#1991

#1993

#1994

#1995

#1996

#1997

#1998

#1999

#2000

#2001

#2003

#2004

#2006

#2008

#2009

#2010

#2013

#2014

#2015

#2016

#2017

#2019

#2020

#2021

#2023

#2024

#2026

#2027

#2028

#2031

#2032

#2033

#2034

#2035

#2036

#2037

#2038

#2039

#2040

#2041

#2042

#2044

#2045

#2046

#2047

#2048

#2050

#2051

#2054

#2055

#2056

#2057

#2058

#2060

#2062

#2064

#2065

#2066

#2067

#2068

#2070

#2071

#2072

#2073

#2074

#2075

#2076

#2077

#2078

#2079

#2080

#2081

#2084

#2085

#2086

#2087

#2088

#2089

#2090

#2091

#2092

#2093

#2094

#2096

#2097

#2098

#2099

#2101

#2102

#2103

#2104

#2105

#2106

#2107

#2109

#2110

#2111

#2112

#2113

#2114

#2115

#2116

#2117

#2118

#2119

#2120

#2121

#2122

#2124

#2125

#2126

#2127

#2128

#2129

#2130

#2131

#2132

#2133

#2134

#2135

#2136

#2138

#2139

#2140

#2141

#2142

#2143

#2144

#2145

#2146

#2147

#2152

#2153

#2154

#2155

#2156

#2157

#2158

#2159

#2160

#2162

#2163

#2165

#2167

#2168

#2170

#2173

#2176

#2181

#2183

#2184

#2185

#2190

#2192

#2199

#2200

#2210

#2211

#2215

#2217

#2218

#2219

#2220

#2222

#2223

#2224

#2225

#2226

#2227

#2228

#2230

#2231

#2233

#2234

#2236

#2237

#2242

#2244

#2246

#2247

#2247

#2249

#2250

#2251

#2252

#2253

#2254

#2255

#2258

#2263

#2263

#2268

#2271

#2271

#2273

#2273

#2274

#2274

#2275

#2275

#2276

#2276

#2277

#2277

#2279

#2279

#2281

#2281

#2282

#2282

#2283

#2283

#2285

#2285

#2287

#2287

#2291

#2292

#2292

#2294

#2294

#2295

#2295

#2296

#2296

#2297

#2297

#2298

#2298

1.0

1.0-M1

1.0-M2

1.0-M3

1.0-M4

1.0-M5

1.0-M6

1.0-M7

1.0-RC1

1.1

1.10

1.11

1.12

1.13

1.14

1.15

1.16

1.17

1.18

1.19

1.2

1.20

1.21

1.22

1.23

1.24

1.25

1.26

1.27

1.28

1.29

1.3

1.30

1.31

1.32

1.33

1.34

1.35

1.36

1.37

1.38

1.39

1.4

1.40

1.41

1.42

1.43

1.44

1.45

1.46

1.47

1.48

1.49

1.5

1.50

1.51

1.52

1.53

1.54

1.55

1.56

1.57

1.58

1.59

1.6

1.60

1.7

1.8

1.9

2.0.0

2.0.0-M1

2.0.0-rc1

2.0.0-rc2

2.0.0-rc3

2.0.0-rc4

2.0.0-rc5

2.0.0-rc6

2.0.0-rc7

2.0.0-rc8

2.1.0

2.1.1

2.10.0

2.10.1

2.11.0

2.11.1

2.12.0

2.13.0

2.14.0

2.14.1

2.15.0

2.15.1

2.16.0

2.17.0

2.17.1

2.18.0

2.19.0

2.19.1

2.2.0

2.20.0

2.20.1

2.21.0

2.22.0

2.23.0

2.24.0

2.25.0

2.26.0

2.26.1

2.27.0

2.27.1

2.27.2

2.27.3

2.27.4

2.28.0

2.29.0

2.29.1

2.3.0

2.3.1

2.30.0

2.30.1

2.31.0

2.31.1

2.32.0

2.32.1

2.32.2

2.33.0

2.34.0

2.35.0

2.36.0

2.36.1

2.37.0

2.37.1

2.37.2

2.38.0

2.38.1

2.39.0

2.39.1

2.4.0

2.4.1

2.40.0

2.40.1

2.41.0

2.41.1

2.42.0

2.42.1

2.42.2

2.42.3

2.43.0

2.43.1

2.44.0

2.44.1

2.44.2

2.44.3

2.45.0

2.45.1

2.45.2

2.46.0

2.46.1

2.46.2

2.46.3

2.46.4

2.46.5

2.46.6

2.47.0

2.48.0

2.48.1

2.48.2

2.48.3

2.48.4

2.5.0

2.6.0

2.6.1

2.6.2

2.6.3

2.7.0

2.7.1

2.8.0

2.9.0

2.9.1

3.0.0

3.0.1

3.0.2

3.0.3

3.0.4

3.1.0

3.10.0

3.10.1

3.10.2

3.10.3

3.11.0

3.11.1

3.11.2

3.2.0

3.2.1

3.2.2

3.3.0

3.4.0

3.4.1

3.4.2

3.5.0

3.6.0

3.6.1

3.7.0

3.7.1

3.7.3

3.7.4

3.7.5

3.7.6

3.7.7

3.8.0

3.9.0

Mono Color

• aedf34c581 Postpone restart after plugin (de)installation Rene Pfeuffer 2019-11-22 15:43:58 +01:00
• 8054540544 Extend timeout on restart after plugin installation Rene Pfeuffer 2019-11-21 16:38:34 +01:00
• 9cf55b8335 Use api client for auto complete Rene Pfeuffer 2019-11-21 13:06:22 +01:00
• c81e78998e Merged in bugfix/fetch_loop (pull request #358) Rene Pfeuffer 2019-11-21 10:18:30 +00:00
• 83e50156de Close branch bugfix/fetch_loop Rene Pfeuffer 2019-11-21 10:18:30 +00:00
• 9bdefb320d Merged in feature/public_flag_migration (pull request #356) Rene Pfeuffer 2019-11-21 10:05:47 +00:00
• 0144d4cc7d Close branch feature/public_flag_migration Rene Pfeuffer 2019-11-21 10:05:47 +00:00
• 1cd7983723 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-21 07:39:28 +01:00
• 67c21b18e3 Move translation key to correct file Rene Pfeuffer 2019-11-20 16:50:18 +01:00
• 0992a5e916 Merged in bugfix/new_pr_undefined_on_diff (pull request #359) Rene Pfeuffer 2019-11-20 15:37:42 +00:00
• 793233146b Close branch bugfix/new_pr_undefined_on_diff Rene Pfeuffer 2019-11-20 15:37:42 +00:00
• bc9f6dd5c0 Merged in feature/add_optional_headers_in_apiclient (pull request #357) Sebastian Sdorra 2019-11-20 15:23:10 +00:00
• ba8c2f4ce7 Close branch feature/add_optional_headers_in_apiclient Sebastian Sdorra 2019-11-20 15:23:10 +00:00
• d962265d8d Correct order of exports Rene Pfeuffer 2019-11-20 14:47:47 +01:00
• 5de7d5df94 show notification if diff is empty Eduard Heimbuch 2019-11-20 13:40:40 +01:00
• 906c27ebba create scmadmin also if only _anonymous user exists Eduard Heimbuch 2019-11-20 11:42:32 +01:00
• 5797b89a8a Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-20 11:15:51 +01:00
• e0fa0d09d9 resolve fetch-loop for users and groups Eduard Heimbuch 2019-11-20 11:15:36 +01:00
• 4f43bce90e Reduce visibility of misleading install function Rene Pfeuffer 2019-11-20 11:14:58 +01:00
• cf17e07cea Do not overwrite existing headers in applyFetchOptions Rene Pfeuffer 2019-11-20 11:12:22 +01:00
• a2474896cc Fix types Rene Pfeuffer 2019-11-20 10:44:11 +01:00
• 20659bc32e Add post and put with text Rene Pfeuffer 2019-11-20 08:59:57 +01:00
• 6ac0ba3ab9 merge 2.0.0-m3 Eduard Heimbuch 2019-11-20 08:54:54 +01:00
• 18c94352cf cleanup Eduard Heimbuch 2019-11-20 08:36:18 +01:00
• 0763ae9440 Add optional heades for api client push and put Rene Pfeuffer 2019-11-20 08:29:05 +01:00
• 49bdf18fb0 fix integration tests Eduard Heimbuch 2019-11-20 08:24:42 +01:00
• fd75277176 cleanup Eduard Heimbuch 2019-11-19 16:43:45 +01:00
• 9046a3f4d5 Merged in bugfix/outdated_context_bottom_border (pull request #355) Eduard Heimbuch 2019-11-19 15:06:12 +00:00
• 303458c44e Close branch bugfix/outdated_context_bottom_border Eduard Heimbuch 2019-11-19 15:06:12 +00:00
• aa7b6f5282 only migrate public flag if repository-v1-xml-backup Eduard Heimbuch 2019-11-19 15:42:22 +01:00
• e7cb674bb5 fix anonymous email Eduard Heimbuch 2019-11-19 14:27:14 +01:00
• e432d6d210 refactor Eduard Heimbuch 2019-11-19 14:23:05 +01:00
• 2ec98c2763 remove repository public flag Eduard Heimbuch 2019-11-19 14:04:47 +01:00
• dd8f84e7c4 implement repository public flag migration to repositoryPermissions for _anonymous user Eduard Heimbuch 2019-11-19 13:50:57 +01:00
• 1d2888f8e6 Fix dequote error in "normal" lines Rene Pfeuffer 2019-11-19 10:13:58 +01:00
• 3a3c27bb67 Enhance logging for diff comparison Rene Pfeuffer 2019-11-19 09:26:01 +01:00
• a795129c70 Remove global style: last div two levels below .modal-card-body Apparently added for the CI plugin on 2019-07-24, but no longer necessary Florian Scholdei 2019-11-19 08:48:46 +01:00
• 85861eddcc Merged in bugfix/decode_git_filenames_in_diff (pull request #337) Sebastian Sdorra 2019-11-18 15:05:36 +00:00
• e9856b1643 Close branch bugfix/decode_git_filenames_in_diff Sebastian Sdorra 2019-11-18 15:05:36 +00:00
• 0abb2e108d Merged in bugfix/missing_styles (pull request #353) Eduard Heimbuch 2019-11-18 13:20:16 +00:00
• 142a55d66c Close branch bugfix/missing_styles Eduard Heimbuch 2019-11-18 13:20:16 +00:00
• c6ba50b3b5 fix path for loading migration styles Eduard Heimbuch 2019-11-18 14:18:37 +01:00
• 1ac39d1355 Merged in bugfix/anon_after_session_expired (pull request #351) Rene Pfeuffer 2019-11-18 12:42:05 +00:00
• bf98c59050 Close branch bugfix/anon_after_session_expired Rene Pfeuffer 2019-11-18 12:42:05 +00:00
• 436252b7a9 Merged in bugfix/anon_not_deletable (pull request #354) Sebastian Sdorra 2019-11-18 12:28:50 +00:00
• 02ecef61a3 Close branch bugfix/anon_not_deletable Sebastian Sdorra 2019-11-18 12:28:50 +00:00
• 999a3476e6 move to scm-webapp Sebastian Sdorra 2019-11-18 13:28:28 +01:00
• fdfb033f6a Fix import Rene Pfeuffer 2019-11-18 13:25:08 +01:00
• f12c3920c0 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-18 13:15:54 +01:00
• f960bbd0b9 Replace quotes in git command line, too Rene Pfeuffer 2019-11-18 12:51:16 +01:00
• babbc67653 Prohibit deletion of _anonymous user as long as the anonymous access is still enabled Eduard Heimbuch 2019-11-18 12:06:52 +01:00
• 2c85a137a5 implement client side xsrf protection Sebastian Sdorra 2019-11-18 11:45:48 +01:00
• cbee87fa0c Buffer output and do not create new temp array streams Rene Pfeuffer 2019-11-18 11:41:09 +01:00
• 5ea3c53613 create separate styles bundle Sebastian Sdorra 2019-11-18 10:56:40 +01:00
• b35d407d96 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-18 10:34:12 +01:00
• 78e5c1e21d Merged in feature/pr_approval (pull request #352) Rene Pfeuffer 2019-11-15 11:35:27 +00:00
• f5b7d9f8f9 Close branch feature/pr_approval Rene Pfeuffer 2019-11-15 11:35:27 +00:00
• cc4c4f0822 Fix browse of empty repository Rene Pfeuffer 2019-11-15 09:50:28 +01:00
• 2f5095e76a Handle missing blobs in blob store for lfs pointers Rene Pfeuffer 2019-11-15 09:33:38 +01:00
• 5038c42869 merge 2.0.0-m3 Eduard Heimbuch 2019-11-15 08:56:25 +01:00
• d1747557b3 Make conflict exception accessible with complex context Rene Pfeuffer 2019-11-13 10:48:36 +01:00
• 9132167a6c Add title option to Button and remove IconButton Florian Scholdei 2019-11-12 17:30:37 +01:00
• 6d2bdb6f29 Add IconButton Florian Scholdei 2019-11-12 14:48:32 +01:00
• ad063675f3 Merge with upstream Florian Scholdei 2019-11-12 14:31:10 +01:00
• 234d98aee7 Don't use anonymous access after access token expires Eduard Heimbuch 2019-11-12 13:49:37 +01:00
• f0f134daeb Merged in feature/delete_source_branch (pull request #350) Rene Pfeuffer 2019-11-12 07:50:07 +00:00
• 875b33d5c8 Close branch feature/delete_source_branch Rene Pfeuffer 2019-11-12 07:50:07 +00:00
• cc03af197f Merged in bugfix/merge_with_conflict (pull request #348) Eduard Heimbuch 2019-11-12 07:48:20 +00:00
• b14fb1d852 Close branch bugfix/merge_with_conflict Eduard Heimbuch 2019-11-12 07:48:20 +00:00
• 8ed874c103 Use dedicated exception for default branch deletion Rene Pfeuffer 2019-11-11 16:51:46 +01:00
• f7e42db850 Rename method Rene Pfeuffer 2019-11-11 16:50:39 +01:00
• 8e4606cff1 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-11 16:33:40 +01:00
• 0168234534 Merged in feature/create_branch_without_clone (pull request #349) Sebastian Sdorra 2019-11-11 15:08:27 +00:00
• 6a2bf9d32a Close branch feature/create_branch_without_clone Sebastian Sdorra 2019-11-11 15:08:27 +00:00
• 73efd244ab add BranchCommand to git + hg repositoryServiceProvider Eduard Heimbuch 2019-11-11 11:53:28 +01:00
• 782b201e55 cleanup Eduard Heimbuch 2019-11-11 11:21:51 +01:00
• 39d41a56c5 implement deleteBranchCommand for hg Eduard Heimbuch 2019-11-11 11:16:33 +01:00
• 7cd2cb4ccb implement deleteBranchCommand for git Eduard Heimbuch 2019-11-11 11:15:56 +01:00
• 1695d13a98 Create new branches without clone of git repository Rene Pfeuffer 2019-11-11 10:30:11 +01:00
• c2e30a582f Remove unused mapper Rene Pfeuffer 2019-11-08 16:44:04 +01:00
• 73cdab4ddc Merged in feature/merge_with_squash (pull request #347) Rene Pfeuffer 2019-11-08 15:41:45 +00:00
• 520c0d6ecf Close branch feature/merge_with_squash Rene Pfeuffer 2019-11-08 15:41:45 +00:00
• ae32b6f797 Use dedicated exception for unsupported merge strategies Rene Pfeuffer 2019-11-08 15:44:37 +01:00
• 52ccce1aaa Secure test Rene Pfeuffer 2019-11-08 15:43:51 +01:00
• 8e0026962d Fix typo Rene Pfeuffer 2019-11-08 14:10:27 +01:00
• 313ec7fe5d fix dependencies after removing mergeResource Eduard Heimbuch 2019-11-08 13:10:31 +01:00
• b1216a898b remove mergeResource and move dryRun to review-plugin Eduard Heimbuch 2019-11-08 11:46:13 +01:00
• a41f490871 refactor after review Eduard Heimbuch 2019-11-08 08:36:00 +01:00
• e736ae6c50 cleanup Eduard Heimbuch 2019-11-07 13:42:45 +01:00
• ec6b4493c8 use strategy pattern for mergeStrategies Eduard Heimbuch 2019-11-07 11:50:28 +01:00
• de09097203 cleanup Eduard Heimbuch 2019-11-07 08:14:15 +01:00
• cf90654e24 implement fast forward if possible Eduard Heimbuch 2019-11-06 15:26:20 +01:00
• b4f1e8874a change mergeStrategy order Eduard Heimbuch 2019-11-06 09:54:17 +01:00
• c51118f575 Merged in feature/remove_redundant_logging (pull request #346) Sebastian Sdorra 2019-11-06 08:06:26 +00:00
• 2826273719 Close branch feature/remove_redundant_logging Sebastian Sdorra 2019-11-06 08:06:26 +00:00
• b47cc56a86 Remove redundant logging Rene Pfeuffer 2019-11-06 08:32:00 +01:00
• 7e00d22e9e merge 2.0.0-m3 Eduard Heimbuch 2019-11-06 07:48:35 +01:00
• bc5948f823 add new MergeStrategies Eduard Heimbuch 2019-11-06 07:47:23 +01:00
• 5d7bdc24d4 Make payload parameter optional Florian Scholdei 2019-11-05 16:10:41 +01:00
• 4e053b1aa0 Merged in feature/modify_for_svn (pull request #342) Sebastian Sdorra 2019-11-05 13:30:25 +00:00