summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP attempt to build an org previewertc-org-mode-wikiToon Claes2019-06-042-0/+27
* WIP: Allow org-mode Wiki pagesToon Claes2019-06-044-1/+13
* Merge branch 'ac-graphql-wikisize' into 'master'Nick Thomas2019-06-043-1/+8
|\
| * Expose wiki_size on GraphQL APIAlessio Caiazza2019-06-043-1/+8
|/
* Merge branch 'jej/add-feature-flag-roll-out-issue-template' into 'master'Marin Jankovski2019-06-041-0/+43
|\
| * Adds issue template for feature flag roll outjej/add-feature-flag-roll-out-issue-templateJames Edwards-Jones2019-06-041-0/+43
* | Merge branch '10685-remove-feature-flag-ce' into 'master'Nick Thomas2019-06-045-7/+1
|\ \
| * | Remove spec feature stubbing10685-remove-feature-flag-ceMark Chao2019-06-043-4/+0
| * | Update doc on approvalMark Chao2019-06-041-1/+1
| * | FE: Remove legacy approval feature in MR filesPaul Slaughter2019-06-041-2/+0
* | | Merge branch 'trizzi-master-patch-86505' into 'master'Dmitriy Zaporozhets2019-06-041-59/+15
|\ \ \
| * | | Clarify error message and image in ymltrizzi-master-patch-86505Tim Rizzi2019-06-031-3/+4
| * | | Update yml file comments re: deployTim Rizzi2019-05-301-4/+4
| * | | Update instructions and uncomment out deployTim Rizzi2019-05-301-13/+13
| * | | Simplify deploy script and comment out for CETim Rizzi2019-05-301-11/+16
| * | | Update maven.gitlab-ci.yml for GitLab PackageTim Rizzi2019-05-271-59/+9
* | | | Merge branch 'patch-67' into 'master'Achilleas Pipinellis2019-06-042-77/+29
|\ \ \ \
| * | | | Combine Running Gitaly on its own server detailsBen Bodenmiller2019-06-042-77/+29
|/ / / /
* | | | Merge branch 'cancel-auto-merge-when-merge-request-is-closed' into 'master'Grzegorz Bizon2019-06-043-0/+18
|\ \ \ \
| * | | | Cancel auto merge when merge request is closedcancel-auto-merge-when-merge-request-is-closedShinya Maeda2019-06-043-0/+18
* | | | | Merge branch '58941-use-gitlab-serverless-with-existing-knative-installation'...Grzegorz Bizon2019-06-0426-298/+616
|\ \ \ \ \
| * | | | | Move file one folder level up to avoid namespace conflict58941-use-gitlab-serverless-with-existing-knative-installationJoão Cunha2019-06-035-119/+118
| * | | | | Adapt functions to work for external KnativeJoão Cunha2019-05-2926-298/+617
* | | | | | 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
|/ / / / / / / / /