summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '51271-error-500-due-to-encoding-issues-when-when-attempting-to-...Stan Hu2018-09-121-9/+5
|\
| * 'code_block' closer to original implementationBrett Walker2018-09-111-9/+5
* | Resolve "500 Internal Server Error: Cherrypick commit with empty branch name"🙈 jacopo beschi 🙉2018-09-115-14/+14
|/
* Merge branch 'sh-support-adding-confirmed-emails' into 'master'Robert Speicher2018-09-111-0/+1
|\
| * Add ability to skip user email confirmation with APIStan Hu2018-09-101-0/+1
* | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'Grzegorz Bizon2018-09-111-1/+1
|\ \
| * | use find instead of reject in avatar export fileJames Lopez2018-09-111-1/+1
| * | fix avatar restorerJames Lopez2018-09-111-1/+1
* | | Add additional stub methods for FakeApplicationSettingStan Hu2018-09-101-10/+18
| |/ |/|
* | Simplify setting of in_memory_application_settingsStan Hu2018-09-101-1/+1
* | Work around migration specs failing due to repository storages not being sele...Stan Hu2018-09-101-0/+4
* | Ensure in-memory application settings are cleared before each testRémy Coutable2018-09-101-0/+4
|/
* Merge branch 'api-promote-find-branch' into 'master'Rémy Coutable2018-09-103-11/+8
|\
| * Fix rubocopRobert Schilling2018-09-081-5/+3
| * API: Use find_branch! in all placesRobert Schilling2018-09-083-11/+10
* | Remove Gitlab::GitAccess#authed_via_jwt?Ash McKenzie2018-09-081-6/+0
* | Resolve "Process urls with spaces in all markdown processing"Brett Walker2018-09-083-4/+5
* | Add receive_max_input_size setting to Application settingsRubén Dávila2018-09-072-1/+18
* | Merge branch '7204-follow-up-protected-environments-technical-debt-ce' into '...Kamil Trzciński2018-09-071-1/+7
|\ \
| * | Introduce class methods so CE constants can be easily overridden on EEMayra Cabrera2018-09-071-1/+7
* | | Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into 'm...Douwe Maan2018-09-073-49/+92
|\ \ \
| * | | Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-073-49/+92
* | | | Include private contributions in user contribution graphGeorge Tsiolis2018-09-071-6/+6
* | | | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-0714-101/+26
|\ \ \ \
| * | | | refactor code based on feedbackJames Lopez2018-09-074-8/+8
| * | | | refactor code based on feedbackJames Lopez2018-09-075-8/+8
| * | | | Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-0613-96/+21
* | | | | Resolve "Wiki page attachments not rendered properly"Brett Walker2018-09-072-15/+35
* | | | | Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master'Douwe Maan2018-09-072-3/+4
|\ \ \ \ \
| * | | | | Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequestOswaldo Ferreira2018-09-062-3/+4
| | |/ / / | |/| | |
* | | | | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-075-0/+91
* | | | | Merge branch 'zj-cleanup-port-gitaly' into 'master'Douwe Maan2018-09-072-50/+47
|\ \ \ \ \
| * | | | | Port cleanup tasks to use GitalyZeger-Jan van de Weg2018-09-072-50/+47
* | | | | | Encode remote root refDouglas Barbosa Alexandre2018-09-071-1/+3
* | | | | | Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-074-2/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-0644-151/+1181
| |\ \ \ \ \
| * | | | | | Fix migrationsKamil Trzciński2018-09-041-0/+2
| * | | | | | Fix import/exportKamil Trzciński2018-09-041-0/+4
| * | | | | | Import common metrics into database.Kamil Trzciński2018-09-042-2/+5
* | | | | | | Merge branch 'issue_50488' into 'master'Stan Hu2018-09-071-0/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move project services log to a separate fileFelipe Artur2018-09-061-0/+7
* | | | | | | Add Gitlab::Git::Repository#find_remote_root_refDouglas Barbosa Alexandre2018-09-061-0/+8
* | | | | | | Add Gitlab::GitalyClient::RemoteService#find_remote_root_refDouglas Barbosa Alexandre2018-09-061-0/+12
* | | | | | | Merge branch '43140-reduce-logs-tree-load' into 'master'51201-document-review-appsRémy Coutable2018-09-061-0/+115
|\ \ \ \ \ \ \
| * | | | | | | Extract tree summary logic out of RefsController#logs_treeNick Thomas2018-09-061-0/+115
* | | | | | | | Recognize 'UNLICENSE' license filesJ.D. Bean2018-09-061-1/+1
* | | | | | | | Add git_v2 flag to GitalyClientJames Lopez2018-09-061-1/+1
* | | | | | | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+1
* | | | | | | | Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master'Sean McGivern2018-09-064-22/+80
|\ \ \ \ \ \ \ \