summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | fixed `list_item_spec.js`Phil Hughes2018-09-071-1/+1
| * | | | | update state when staging/unstaging allPhil Hughes2018-09-074-6/+21
| * | | | | fixed discard modal not showingPhil Hughes2018-09-073-10/+11
| * | | | | fixed testsPhil Hughes2018-09-072-15/+6
| * | | | | design improvementsPhil Hughes2018-09-075-27/+54
| * | | | | update components to match designs in commit sectionPhil Hughes2018-09-078-29/+82
| * | | | | Improved IDE commit flowPhil Hughes2018-09-079-49/+165
| | |/ / / | |/| | |
* | | | | Merge branch '51225-fix-artifact-tests-in-jobs_controller_spec' into 'master'Grzegorz Bizon2018-09-071-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Check if key is present with string not symbolSteve Azzopardi2018-09-071-4/+4
* | | | | Merge branch 'boards-querystring-backport' into 'master'Tim Zallmann2018-09-077-78/+80
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | don't add trailing = when in urlParamsToArray functionSimon Knox2018-08-297-78/+80
* | | | | Merge branch 'fix-namespace-uploader' into 'master'Kamil Trzciński2018-09-073-9/+28
|\ \ \ \ \
| * | | | | Fix NamespaceUploader.base_dir for remote uploadsfix-namespace-uploaderJarka Kadlecová2018-08-213-9/+28
* | | | | | Merge branch 'ide-file-templates' into 'master'Tim Zallmann2018-09-0720-33/+782
|\ \ \ \ \ \
| * | | | | | fixed double scrollPhil Hughes2018-09-075-16/+17
| * | | | | | fixed some bugs around with the template dropdownsPhil Hughes2018-09-076-11/+28
| * | | | | | added component specsPhil Hughes2018-09-078-22/+345
| * | | | | | regenerate gitlab.pot filePhil Hughes2018-09-071-3/+3