delta/gitlab/gitlab-ce.git, branch mh/mocks-doc gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into mh/mocks-doc 2019-06-10T19:15:14+00:00 Martin Hanzel mhanzel@gitlab.com 2019-06-10T19:15:14+00:00 dc29536f3539428a54ffdfdbe2921ff4da1f2d4e 






Add timeout and mock docs to FE testing guide
2019-06-10T18:34:08+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-10T18:34:08+00:00

eaac8810e6659964f60234c802ed44fa3da74d00












Apply code review suggestions
2019-06-07T08:29:25+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-07T08:20:09+00:00

54b5653c4b4343cc0525dc046bf0931f9083ecfb












Add auto-injection for manual mocks
2019-06-07T06:50:20+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-07T06:50:06+00:00

0f878df58c0c35f0a526f0575e429d9e9bb00e7e

Add a function that scans the mocks dir in spec/frontend/mocks and
automatically registers mocks, bypassing Jest's inconsistent
__mocks__/ behaviour.





Add a function that scans the mocks dir in spec/frontend/mocks and
automatically registers mocks, bypassing Jest's inconsistent
__mocks__/ behaviour.







Rework jest mock tests
2019-06-06T13:33:39+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-06T13:33:39+00:00

490ed11537c71fa58392b617bfb2c6ca87b3e458












Move manual mocks to non-underscored folder
2019-06-06T11:57:10+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-06T11:34:37+00:00

756d21692e0b0d4806d9d9d32ad717c62a9d5e31












Set up jest mocks manually
2019-06-06T11:26:09+00:00

Martin Hanzel
mhanzel@gitlab.com

2019-06-06T11:26:09+00:00

0e62cae71f5aa59ec054335e03d99ff24ee61369












Merge branch 'ci-variable-expression-con-dis-junction' into 'master'
2019-06-06T08:34:57+00:00

Kamil Trzciński
ayufan@ayufan.eu

2019-06-06T08:34:57+00:00

502cbda11ba0c6d798b243ab6f489cd73c7bdeea

CI variable expression conjunction/disjunction

See merge request gitlab-org/gitlab-ce!27925




CI variable expression conjunction/disjunction

See merge request gitlab-org/gitlab-ce!27925






Merge branch 'revert-86900f00' into 'master'
2019-06-06T08:32:04+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2019-06-06T08:32:04+00:00

8501edcd465923c9c6a45abe6c863fc3cd25973a

Revert "Disable retrying cancelled jobs"

Closes #62350

See merge request gitlab-org/gitlab-ce!29201




Revert "Disable retrying cancelled jobs"

Closes #62350

See merge request gitlab-org/gitlab-ce!29201






Merge branch 'docs/port-insights-from-ee' into 'master'
2019-06-06T08:23:33+00:00

Achilleas Pipinellis
axil@gitlab.com

2019-06-06T08:23:33+00:00

6e5d891e508d92f3a983f2edd4f441c8b0fdad74

Port EE changes from doc/user/project/insights/index.md

Closes gitlab-ee#11974

See merge request gitlab-org/gitlab-ce!29252




Port EE changes from doc/user/project/insights/index.md

Closes gitlab-ee#11974

See merge request gitlab-org/gitlab-ce!29252