summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* render keyboard shortcut correctlydocs-render-keyboard-shortcutBen Bodenmiller2019-05-131-1/+1
* 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
| * | | | | Merge PDF fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| * | | | | Expose response variable for raw file fixturesWinnie Hellmann2019-05-101-7/+8
| * | | | | Call store_frontend_fixture() in JavaScriptFixturesHelpersWinnie Hellmann2019-05-101-7/+11
| | |_|/ / | |/| | |
* | | | | Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600Rémy Coutable2019-05-103-0/+13
|\ \ \ \ \
| * | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-103-0/+13
|/ / / / /
* | | | | Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-05-102-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't run full gc in AfterImportServicesh-revert-full-gc-after-importStan Hu2019-05-102-2/+2
|/ / / /
* | | | Merge branch 'lets-encrypt-docs' into 'master'Rémy Coutable2019-05-101-2/+2
|\ \ \ \
| * | | | Update option to enforce HTTPSgfyoung2019-05-101-2/+2
|/ / / /
* | | | Merge branch 'sh-fix-invited-members' into 'master'Rémy Coutable2019-05-103-2/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix Error 500 when inviting user already presentStan Hu2019-05-103-2/+27
|/ / /
* | | Merge branch 'fix-60425' into 'master'Nick Thomas2019-05-099-19/+31
|\ \ \
| * | | Change DetectRepositoryLanguagesWorker to not receive userDiego Silva2019-05-099-19/+31
* | | | Merge branch '61635-flaky-spec-dashboard-user_filters_projects_spec' into 'ma...Stan Hu2019-05-091-44/+12
|\ \ \ \
| * | | | Fix a flaky spec for sorting projects in dashboard61635-flaky-spec-dashboard-user_filters_projects_specRémy Coutable2019-05-091-44/+12
* | | | | Merge branch '6659-extract-ee-specific-files-lines-for-spec-lib-gitlab-easier...Yorick Peterse2019-05-091-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update usage_data_spec to match EEJames Lopez2019-05-091-2/+2
|/ / / /
* | | | Merge branch 'whitelist-gitaly-when-forking-project' into 'master'Rémy Coutable2019-05-091-6/+17
|\ \ \ \
| * | | | Whitelist Gitaly N+1 for forking in testsNick Thomas2019-05-091-6/+17