summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix connection to Tiller error while uninstalling62713-fix-uninstalling-cluster-appsThong Kuah2019-06-053-0/+30
* Merge branch 'introduce-auto-merge-process-worker' into 'master'Thong Kuah2019-06-048-35/+93
|\
| * Introduce sidekiq worker for auto merge processintroduce-auto-merge-process-workerShinya Maeda2019-06-048-35/+93
* | Merge branch '61960-translatable-strings-in-issue-closure-emails' into 'master'Rémy Coutable2019-06-047-10/+28
|\ \
| * | Change s_() calls to _() callsMichał Zając2019-06-047-10/+28
|/ /
* | Merge branch 'qa-de-quarantine-e2e-test' into 'master'Rémy Coutable2019-06-041-4/+3
|\ \
| * | Update e2e test with more explicit methodsqa-de-quarantine-e2e-testWalmyr Lima2019-06-031-2/+2
| * | De-quarantine e2e test for issue suggestionsWalmyr Lima2019-06-031-2/+1
* | | Merge branch 'puma-fix' into 'master'Kamil Trzciński2019-06-042-1/+29
|\ \ \
| * | | Ignore Puma empty worker statsJan Provaznik2019-06-042-1/+29
|/ / /
* | | Merge branch '62618-docs-feedback-unstage-page-needs-clarification' into 'mas...Achilleas Pipinellis2019-06-041-2/+2
|\ \ \
| * | | Update unstage doc to clarify reset62618-docs-feedback-unstage-page-needs-clarificationZeff Morgan2019-06-041-2/+2
| | |/ | |/|
* | | Merge branch 'docs/edit-phabricator-docs' into 'master'Achilleas Pipinellis2019-06-041-8/+5
|\ \ \
| * | | Fixes some Phabricator import docs problemsEvan Read2019-06-041-8/+5
|/ / /
* | | Merge branch 'set-real-next-run-at-for-preventing-duplciate-pipeline-creation...Kamil Trzciński2019-06-0411-150/+234
|\ \ \
| * | | Make pipeline schedule worker resilientset-real-next-run-at-for-preventing-duplciate-pipeline-creationsShinya Maeda2019-06-0311-150/+234
* | | | Merge branch 'ce-fe-fix-ee-diff-profile-key-views' into 'master'Bob Van Landuyt2019-06-043-4/+11
|\ \ \ \
| * | | | Resolved EE differences in app/views/profiles/keysce-fe-fix-ee-diff-profile-key-viewsPaul Slaughter2019-05-313-4/+11
* | | | | Merge branch 'adriel-expand-collapse-operation-settings' into 'master'Kushal Pandya2019-06-044-3/+12
|\ \ \ \ \
| * | | | | Add expand/collapse buttonAdriel Santiago2019-06-044-3/+12
|/ / / / /
* | | | | Merge branch 'docs/ssot_admin_area_third_party_offers' into 'master'Evan Read2019-06-041-3/+20
|\ \ \ \ \
| * | | | | Edited `Third Party Offers` for SSOT guidelinesRussell Dickenson2019-06-041-3/+20
|/ / / / /
* | | | | Merge branch '61640-set-font-size-on-html-not-body' into 'master'Mike Greiling2019-06-042-2/+4
|\ \ \ \ \
| * | | | | Use rems for body font-size to help accessibility61640-set-font-size-on-html-not-bodySam Bigelow2019-06-032-2/+4
* | | | | | Merge branch 'docs-aws-elb-web-terminals' into 'master'Mike Lewis2019-06-041-0/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add AWS ELB note about not supporting web socketsdocs-aws-elb-web-terminalsDrew Blessing2019-05-021-0/+5
* | | | | | Merge branch 'docs-update-ci-quickstart-readme' into 'master'Evan Read2019-06-041-1/+9
|\ \ \ \ \ \
| * | | | | | Add CI quickstart updatesCindy Pallares 🦉2019-06-041-1/+9
|/ / / / / /
* | | | | | Merge branch 'docs/admin_area_gitaly_servers' into 'master'Evan Read2019-06-041-1/+18
|\ \ \ \ \ \
| * | | | | | Document the Admin Area's *Gitaly Servers* pageRussell Dickenson2019-06-041-1/+18
|/ / / / / /
* | | | | | Merge branch 'sh-fix-version-12-0' into 'master'Robert Speicher2019-06-041-1/+1
|\ \ \ \ \ \
| * | | | | | VERSION file should be 12.0, not 11.12Stan Hu2019-06-031-1/+1
* | | | | | | Merge branch 'docs/ssot_sign_up_restrictions' into 'master'Evan Read2019-06-041-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Edited signup restrictions for SSOT guidelinesRussell Dickenson2019-06-041-0/+16
|/ / / / / / /
* | | | | | | Merge branch 'docs/fix-doc-block' into 'master'Evan Read2019-06-031-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix markdown parsing for doc pagedocs/fix-doc-blockSteve Azzopardi2019-06-031-3/+3
* | | | | | | | Merge branch 'nik-api-snippets-fix' into 'master'Evan Read2019-06-031-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update description of Snippets API, create and update methodsNikolay Samokhvalov2019-06-031-5/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-import-url-update' into 'master'Thong Kuah2019-06-033-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix project settings not being able to updateStan Hu2019-06-033-0/+19
* | | | | | | | | Merge branch 'docs/instance_template_repository_ssot' into 'master'Evan Read2019-06-031-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Edit *Instance template repository* for SSOT epicRussell Dickenson2019-06-031-0/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-herokuish-instead-of-bin-setup' into 'master'Evan Read2019-06-031-7/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use /bin/herokuish in Auto DevOps docs examplesdocs-herokuish-instead-of-bin-setupDylan Griffith2019-06-031-7/+8
* | | | | | | | | | Merge branch 'ce-nfriend-no-implicit-coercion-fixes' into 'master'Mike Greiling2019-06-0350-71/+76
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Comply with `no-implicit-coercion` rule (CE)Nathan Friend2019-06-0350-71/+76
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '61264-dast-report-error' into 'master'Mayra Cabrera2019-06-031-36/+38
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Backporting EE fixrossfuhrman2019-06-031-36/+38
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-boardsStore.moving' into 'master'Mike Greiling2019-06-033-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move boardsStore.moving to BoardList componentWinnie Hellmann2019-06-033-2/+21
|/ / / / / / / / /