summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update to latest version of commonmarker gembw-upgrade-commonmarkerBrett Walker2018-09-071-1/+1
* Merge branch 'rd-26044-new-option-to-prevent-too-big-git-pushes' into 'master'Robert Speicher2018-09-0710-2/+83
|\
| * Add receive_max_input_size setting to Application settingsRubén Dávila2018-09-0710-2/+83
* | Merge branch 'patch-29' into 'master'Annabel Dunstone Gray2018-09-072-1/+2
|\ \
| * | Vertically centres landscape avatars those cannot fill up parent height.Vicary Archangel2018-09-072-1/+2
|/ /
* | Merge branch '51180-update-ffi-to-1.9.25' into 'master'Robert Speicher2018-09-074-3/+8
|\ \ | |/ |/|
| * Update ffi to 1.9.25Takuya Noguchi2018-09-064-3/+8
* | Merge branch 'sh-bump-gitlab-shell-8.2.1' into 'master'Nick Thomas2018-09-071-1/+1
|\ \
| * | Bump gitlab-shell to 8.2.1 to resolve HTTP status code handlingStan Hu2018-09-071-1/+1
* | | Merge branch 'dblessing-ldap-codeowner' into 'master'Douwe Maan2018-09-071-0/+2
|\ \ \
| * | | Add @mkozono to CODEOWNERS for LDAPDrew Blessing2018-09-071-2/+2
| * | | Add dblessing to CODEOWNERS for LDAP Drew Blessing2018-09-071-0/+2
* | | | Merge branch 'fix-label-ref' into 'master'Robert Speicher2018-09-071-2/+2
|\ \ \ \
| * | | | Sort labels by referenceJan Provaznik2018-09-071-2/+2
| |/ / /
* | | | Merge branch '7204-follow-up-protected-environments-technical-debt-ce' into '...Kamil Trzciński2018-09-072-2/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Introduce class methods so CE constants can be easily overridden on EEMayra Cabrera2018-09-072-2/+14
* | | | Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into 'm...Douwe Maan2018-09-079-51/+174
|\ \ \ \
| * | | | Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-079-51/+174
* | | | | Merge branch 'sh-remove-orphaned-label-links' into 'master'Yorick Peterse2018-09-074-0/+89
|\ \ \ \ \
| * | | | | Remove orphaned label linksStan Hu2018-09-074-0/+89
* | | | | | Merge branch 'feat/update-contribution-calendar' into 'master'Nick Thomas2018-09-0725-134/+249
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Include private contributions in user contribution graphGeorge Tsiolis2018-09-0725-134/+249
|/ / / / /
* | | | | Merge branch 'usage_consent' into 'master'Douwe Maan2018-09-0718-15/+267
|\ \ \ \ \
| * | | | | Ask user explicitly about usage stats agreementJan Provaznik2018-09-0718-15/+267
|/ / / / /
* | | | | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-0746-899/+109
|\ \ \ \ \
| * | | | | fix specsJames Lopez2018-09-071-0/+0
| * | | | | refactor code based on feedbackJames Lopez2018-09-0710-16/+16
| * | | | | refactor code based on feedbackJames Lopez2018-09-0711-18/+22
| * | | | | Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-0644-893/+99
* | | | | | Merge branch '51196-wiki-page-attachments-not-rendered-properly' into 'master'Douwe Maan2018-09-074-43/+114
|\ \ \ \ \ \
| * | | | | | Resolve "Wiki page attachments not rendered properly"Brett Walker2018-09-074-43/+114
|/ / / / / /
* | | | | | Merge branch 'fj-51194-fix-wiki-attachments-with-whitespaces' into 'master'Douwe Maan2018-09-073-3/+38
|\ \ \ \ \ \
| * | | | | | Replace whitespaces in wiki page attachments file namesFrancisco Javier López2018-09-073-3/+38
|/ / / / / /
* | | | | | Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master'Douwe Maan2018-09-074-5/+25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequestOswaldo Ferreira2018-09-067-10/+30
| | |/ / / | |/| | |
* | | | | Merge branch 'label-event' into 'master'51233-process-urls-with-spaces-to-support-old-attachment-uploadsJan Provaznik2018-09-0757-174/+1191
|\ \ \ \ \
| * | | | | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-0757-174/+1191
|/ / / / /
* | | | | Merge branch 'zj-cleanup-port-gitaly' into 'master'Douwe Maan2018-09-075-66/+73
|\ \ \ \ \
| * | | | | Port cleanup tasks to use GitalyZeger-Jan van de Weg2018-09-075-66/+73
* | | | | | Merge branch 'da-find-remote-root-ref' into 'master'Stan Hu2018-09-073-1/+16
|\ \ \ \ \ \
| * | | | | | Encode remote root refDouglas Barbosa Alexandre2018-09-073-1/+16
|/ / / / / /
* | | | | | Merge branch 'leipert-dedupe-dependencies' into 'master'Phil Hughes2018-09-071-113/+17
|\ \ \ \ \ \
| * | | | | | Dedupe frontend dependenciesLukas Eipert2018-09-071-113/+17
* | | | | | | Merge branch 'patch-28' into 'master'Douwe Maan2018-09-071-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Update robots.txt (#51167)Moritz Schlarb2018-09-071-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ide-commit-panel-improved' into 'master'Tim Zallmann2018-09-0720-122/+356
|\ \ \ \ \ \ \
| * | | | | | | i18n on some stringsPhil Hughes2018-09-074-10/+22
| * | | | | | | de-duplicate gitlab-svgLukas Eipert2018-09-071-5/+1
| * | | | | | | added CHANGELOGPhil Hughes2018-09-071-0/+5
| * | | | | | | karma fixesPhil Hughes2018-09-072-8/+26