summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add more logging in the Review Apps deployment steps59569-some-steps-are-missed-during-review-apps-deploymentsRémy Coutable2019-03-281-125/+161
* Merge branch 'docs/review-MR-25586' into 'master'Achilleas Pipinellis2019-03-282-19/+16
|\
| * Docs review for MR 25586Evan Read2019-03-282-19/+16
|/
* Merge branch 'zm-test-plan-refs' into 'master'Achilleas Pipinellis2019-03-282-1/+16
|\
| * Update testing guide to reference test designZeff Morgan2019-03-262-1/+16
* | Merge branch '54670-external-diffs-when-outdated' into 'master'Sean McGivern2019-03-2817-24/+563
|\ \
| * | Allow external diffs to be used conditionallyNick Thomas2019-03-2717-24/+563
* | | Merge branch '59273-update-fugit' into 'master'Grzegorz Bizon2019-03-282-1/+6
|\ \ \
| * | | Update fugit which fixes a potential infinite loopLin Jen-Shin2019-03-262-1/+6
* | | | Merge branch '59062-update-gitlab-markup-python-3' into 'master'Sean McGivern2019-03-287-3/+130
|\ \ \ \
| * | | | Upgrade `gitlab-markup` to 1.7.0Gabriel Mazetto2019-03-277-3/+130
| | |/ / | |/| |
* | | | Merge branch 'fix-routes-n-plus-one-in-user-autocomplete' into 'master'Grzegorz Bizon2019-03-285-18/+84
|\ \ \ \
| * | | | Remove N+1 queries from users autocompleteSean McGivern2019-03-255-18/+84
* | | | | Merge branch '59546-fix-error-handling-for-missing-domain' into 'master'Sean McGivern2019-03-282-1/+6
|\ \ \ \ \
| * | | | | Fix Auto DevOps missing domain error handlingDylan Griffith2019-03-282-1/+6
* | | | | | Merge branch 'qa-allow-gitlab-qa-pat-env-var' into 'master'Rémy Coutable2019-03-285-11/+11
|\ \ \ \ \ \
| * | | | | | Allow token env var from gitlab-qaMark Lapierre2019-03-285-11/+11
|/ / / / / /
* | | | | | Merge branch 'rubocop-handle-ee-migration-specs' into 'master'Rémy Coutable2019-03-282-1/+19
|\ \ \ \ \ \
| * | | | | | Properly handle `ee` migration specsHeinrich Lee Yu2019-03-282-1/+19
* | | | | | | Merge branch 'ce-reduce-ee-diff-in-spec-policies' into 'master'Lin Jen-Shin2019-03-2810-447/+432
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [CE] Reduce the diff with EE in spec/policies/group_policy_spec.rbRémy Coutable2019-03-272-49/+48
| * | | | | | Factorize policy helpers into PolicyHelpersRémy Coutable2019-03-276-32/+12
| * | | | | | [CE] Reduce the diff with EE in spec/policies/project_policy_spec.rbRémy Coutable2019-03-274-373/+379
| * | | | | | [CE] Reduce the diff with EE in spec/policies/namespace_policy_spec.rbRémy Coutable2019-03-271-1/+1
* | | | | | | Merge branch 'patch-43' into 'master'Evan Read2019-03-281-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Update U2F recommendations, fix #57656Mateusz Konieczny2019-03-281-3/+4
|/ / / / / / /
* | | | | | | Merge branch 'docs/build-to-job-webhooks' into 'master'Evan Read2019-03-281-15/+15
|\ \ \ \ \ \ \
| * | | | | | | Rename build to job in webhooks docsAchilleas Pipinellis2019-03-271-15/+15
* | | | | | | | Merge branch 'revert-c624c61a' into 'master'Clement Ho2019-03-2717-195/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"Kamil Trzciński2019-03-2717-195/+50
|/ / / / / / / /
* | | | | | | | Merge branch 'tz-upgrade-vue-2019-03-11' into 'master'Clement Ho2019-03-279-140/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgraded Vue to 2.6.8Tim Zallmann2019-03-279-140/+122
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-add-gitaly-duration-logs' into 'master'Douglas Barbosa Alexandre2019-03-275-13/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Log Gitaly RPC duration to api_json.log and production_json.logStan Hu2019-03-275-13/+35
* | | | | | | | | Merge branch '13784-validate-variables-for-masking' into 'master'Kamil Trzciński2019-03-2717-50/+195
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Scaffold UI elements for minimal versionMiranda Fluharty2019-03-2717-50/+195
|/ / / / / / / / /
* | | | | | | | | Merge branch 'refactor-verify-pages-domain-specs' into 'master'Kamil Trzciński2019-03-271-50/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor verify_pages_domain_service specsVladimir Shushlin2019-03-271-50/+92
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-ml-feature-flag-command-line' into 'master'Dan Davison2019-03-2719-26/+259
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set feature flag via command lineMark Lapierre2019-03-2719-26/+259
|/ / / / / / / / /
* | | | | | | | | Merge branch 'leipert-upgrade-bootstrap-ce' into 'master'Clement Ho2019-03-275-17/+84
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Disable icons in bootstrap form validationLukas Eipert2019-03-271-0/+8
| * | | | | | | | Whitelist additional elements and attributesLukas Eipert2019-03-271-0/+60
| * | | | | | | | Update bootstrap to 4.3.1Lukas Eipert2019-03-273-17/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs/improve-auto-fetch-endpoint' into 'master'Achilleas Pipinellis2019-03-271-5/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Expand and improve autofetch of endpoint sectionEvan Read2019-03-271-5/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-disable_nfs_delegation' into 'master'Achilleas Pipinellis2019-03-271-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Recommend disabling NFS server delegationDrew Blessing2019-03-271-3/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'osw-multi-line-suggestions-creation-strategy' into 'master'Andreas Brandl2019-03-2728-147/+633
|\ \ \ \ \ \ \ \
| * | | | | | | | Prepare suggestion implementation for multi-lineOswaldo Ferreira2019-03-2728-149/+613