summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve CE/EE diffs in help/indexhelp-scbLuke Bennett2019-05-151-2/+1
* Merge branch '61302-remove-ignore_column-ci_cd' into 'master'Douglas Barbosa Alexandre2019-05-131-1/+0
|\
| * Remove ignore_column from Project model61302-remove-ignore_column-ci_cdDmitriy Zaporozhets2019-05-101-1/+0
* | Merge branch 'winh-frontend-tests-check-dependencies' into 'master'Kushal Pandya2019-05-131-0/+4
|\ \
| * | Ensure that dependencies are installed before running frontend testswinh-frontend-tests-check-dependenciesWinnie Hellmann2019-05-131-0/+4
* | | Merge branch 'ce-11542-remove-non-semantic-use-of-row-in-member-listing-contr...Kushal Pandya2019-05-132-1/+6
|\ \ \
| * | | Remove non-semantic use of `.row` in member listing controlsce-11542-remove-non-semantic-use-of-row-in-member-listing-controlsDennis Tang2019-05-082-1/+6
* | | | Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-131-0/+5
|\ \ \ \
| * | | | Adds changelog entry for Matomostring website ID supportCDuv2019-05-101-0/+5
* | | | | Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat2019-05-137-33/+34
|\ \ \ \ \
| * | | | | Add branch_name qa selectorqa-ml-fix-branches-testMark Lapierre2019-05-075-16/+28
| * | | | | Check test result via an assertionMark Lapierre2019-05-012-11/+3
| * | | | | Make max wait time a constantMark Lapierre2019-05-011-1/+3
| * | | | | Wait for branches to not be presentMark Lapierre2019-04-292-14/+9
* | | | | | Merge branch 'bvl-fix-graphql-autoloading' into 'master'Nick Thomas2019-05-131-0/+4
|\ \ \ \ \ \
| * | | | | | Eager load the GraphQL schema in specsBob Van Landuyt2019-05-101-0/+4
* | | | | | | Merge branch 'explain-artifacts-server-configuration-docs' into 'master'Nick Thomas2019-05-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docsKrasimir Angelov2019-05-101-1/+1
* | | | | | | | Merge branch 'graphql-docs-fix' into 'master'Phil Hughes2019-05-131-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Update doc/development/fe_guide/graphql.mdNatalia Tepluhina2019-05-131-2/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-update-salesforce-documentation' into 'master'Evan Read2019-05-121-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: Fix wording error in salesforce sectionGosia Ksionek2019-05-121-4/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2019-05-121-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix typos in new_ci_build_permissions_model.mdBen Bodenmiller2019-05-041-2/+2
* | | | | | | | | Merge branch 'updateWebhooksIssueMR' into 'master'Achilleas Pipinellis2019-05-121-4/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update `updated_at`field tooManeschi Romain2019-05-121-4/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-k8s-apps-architecture-overview' into 'master'Achilleas Pipinellis2019-05-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update K8S apps to checkmarkk8s-apps-architecture-overviewMatija Čupić2019-05-101-1/+1
* | | | | | | | | | Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-112-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-102-0/+9
* | | | | | | | | | | Merge branch 'sh-update-process-mem' into 'master'Ash McKenzie2019-05-112-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update get_process_mem to 0.2.3sh-update-process-memStan Hu2019-05-102-1/+6
* | | | | | | | | | | Merge branch 'winh-frontend-test-waiting-docs' into 'master'Mike Lewis2019-05-101-1/+182
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Provide alternatives to using setTimeout in frontend testswinh-frontend-test-waiting-docsWinnie Hellmann2019-05-091-1/+182
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-add-omnibus-secrets' into 'master'Grzegorz Bizon2019-05-101-0/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '61550-next-badge' into 'master'Phil Hughes2019-05-102-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes next badge being always visible61550-next-badgeFilipa Lacerda2019-05-102-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'Lin Jen-Shin2019-05-101-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix unrelated errors when teardowning quanrantined specsavoid-unrelated-errors-in-quarantined-specsRémy Coutable2019-05-101-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'update-ci-minutes-doc' into 'master'Achilleas Pipinellis2019-05-101-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update CI minutes docs to reflect this is available to all plansJames Lopez2019-05-101-2/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre2019-05-103-2/+35
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Properly handle LFS Batch API response in project importsh-fix-lfs-download-errorsStan Hu2019-05-093-2/+35
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-simplify-frontend-fixtures' into 'master'Rémy Coutable2019-05-1030-165/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove trailing empty lineswinh-simplify-frontend-fixturesWinnie Hellmann2019-05-102-6/+0
| * | | | | | | | Remove unused fixture_file_name parametersWinnie Hellmann2019-05-103-20/+20
| * | | | | | | | Remove example block parametersWinnie Hellmann2019-05-1027-56/+56
| * | | | | | | | Remove duplicate store_frontend_fixture() callsWinnie Hellmann2019-05-1027-44/+0
| * | | | | | | | Merge balsamiq fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7