Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sh-remove-orphaned-label-links' into 'master' | Yorick Peterse | 2018-09-07 | 4 | -0/+89 |
|\ | |||||
| * | Remove orphaned label links | Stan Hu | 2018-09-07 | 4 | -0/+89 |
* | | Merge branch 'feat/update-contribution-calendar' into 'master' | Nick Thomas | 2018-09-07 | 25 | -134/+249 |
|\ \ | |/ |/| | |||||
| * | Include private contributions in user contribution graph | George Tsiolis | 2018-09-07 | 25 | -134/+249 |
|/ | |||||
* | Merge branch 'usage_consent' into 'master' | Douwe Maan | 2018-09-07 | 18 | -15/+267 |
|\ | |||||
| * | Ask user explicitly about usage stats agreement | Jan Provaznik | 2018-09-07 | 18 | -15/+267 |
|/ | |||||
* | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master' | Douwe Maan | 2018-09-07 | 46 | -899/+109 |
|\ | |||||
| * | fix specs | James Lopez | 2018-09-07 | 1 | -0/+0 |
| * | refactor code based on feedback | James Lopez | 2018-09-07 | 10 | -16/+16 |
| * | refactor code based on feedback | James Lopez | 2018-09-07 | 11 | -18/+22 |
| * | Refactor code to remove object storage flag from Import/Export | James Lopez | 2018-09-06 | 44 | -893/+99 |
* | | Merge branch '51196-wiki-page-attachments-not-rendered-properly' into 'master' | Douwe Maan | 2018-09-07 | 4 | -43/+114 |
|\ \ | |||||
| * | | Resolve "Wiki page attachments not rendered properly" | Brett Walker | 2018-09-07 | 4 | -43/+114 |
|/ / | |||||
* | | Merge branch 'fj-51194-fix-wiki-attachments-with-whitespaces' into 'master' | Douwe Maan | 2018-09-07 | 3 | -3/+38 |
|\ \ | |||||
| * | | Replace whitespaces in wiki page attachments file names | Francisco Javier López | 2018-09-07 | 3 | -3/+38 |
|/ / | |||||
* | | Merge branch 'osw-send-max-patch-bytes-to-gitaly' into 'master' | Douwe Maan | 2018-09-07 | 4 | -5/+25 |
|\ \ | |||||
| * | | Send max_patch_bytes to Gitaly via Gitaly::CommitDiffRequest | Oswaldo Ferreira | 2018-09-06 | 7 | -10/+30 |
* | | | Merge branch 'label-event' into 'master'51233-process-urls-with-spaces-to-support-old-attachment-uploads | Jan Provaznik | 2018-09-07 | 57 | -174/+1191 |
|\ \ \ | |||||
| * | | | Use ResourceLabelEvent for tracking label changes | Jan Provaznik | 2018-09-07 | 57 | -174/+1191 |
|/ / / | |||||
* | | | Merge branch 'zj-cleanup-port-gitaly' into 'master' | Douwe Maan | 2018-09-07 | 5 | -66/+73 |
|\ \ \ | |||||
| * | | | Port cleanup tasks to use Gitaly | Zeger-Jan van de Weg | 2018-09-07 | 5 | -66/+73 |
* | | | | Merge branch 'da-find-remote-root-ref' into 'master' | Stan Hu | 2018-09-07 | 3 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | Encode remote root ref | Douglas Barbosa Alexandre | 2018-09-07 | 3 | -1/+16 |
|/ / / / | |||||
* | | | | Merge branch 'leipert-dedupe-dependencies' into 'master' | Phil Hughes | 2018-09-07 | 1 | -113/+17 |
|\ \ \ \ | |||||
| * | | | | Dedupe frontend dependencies | Lukas Eipert | 2018-09-07 | 1 | -113/+17 |
* | | | | | Merge branch 'patch-28' into 'master' | Douwe Maan | 2018-09-07 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update robots.txt (#51167) | Moritz Schlarb | 2018-09-07 | 1 | -0/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ide-commit-panel-improved' into 'master' | Tim Zallmann | 2018-09-07 | 20 | -122/+356 |
|\ \ \ \ \ | |||||
| * | | | | | i18n on some strings | Phil Hughes | 2018-09-07 | 4 | -10/+22 |
| * | | | | | de-duplicate gitlab-svg | Lukas Eipert | 2018-09-07 | 1 | -5/+1 |
| * | | | | | added CHANGELOG | Phil Hughes | 2018-09-07 | 1 | -0/+5 |
| * | | | | | karma fixes | Phil Hughes | 2018-09-07 | 2 | -8/+26 |
| * | | | | | fixed `list_item_spec.js` | Phil Hughes | 2018-09-07 | 1 | -1/+1 |
| * | | | | | update state when staging/unstaging all | Phil Hughes | 2018-09-07 | 4 | -6/+21 |
| * | | | | | fixed discard modal not showing | Phil Hughes | 2018-09-07 | 3 | -10/+11 |
| * | | | | | fixed tests | Phil Hughes | 2018-09-07 | 2 | -15/+6 |
| * | | | | | design improvements | Phil Hughes | 2018-09-07 | 5 | -27/+54 |
| * | | | | | update components to match designs in commit section | Phil Hughes | 2018-09-07 | 8 | -29/+82 |
| * | | | | | Improved IDE commit flow | Phil Hughes | 2018-09-07 | 9 | -49/+165 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '51225-fix-artifact-tests-in-jobs_controller_spec' into 'master' | Grzegorz Bizon | 2018-09-07 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Check if key is present with string not symbol | Steve Azzopardi | 2018-09-07 | 1 | -4/+4 |
* | | | | | Merge branch 'boards-querystring-backport' into 'master' | Tim Zallmann | 2018-09-07 | 7 | -78/+80 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | don't add trailing = when in urlParamsToArray function | Simon Knox | 2018-08-29 | 7 | -78/+80 |
* | | | | | Merge branch 'fix-namespace-uploader' into 'master' | Kamil Trzciński | 2018-09-07 | 3 | -9/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Fix NamespaceUploader.base_dir for remote uploadsfix-namespace-uploader | Jarka Kadlecová | 2018-08-21 | 3 | -9/+28 |
* | | | | | | Merge branch 'ide-file-templates' into 'master' | Tim Zallmann | 2018-09-07 | 20 | -33/+782 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fixed double scroll | Phil Hughes | 2018-09-07 | 5 | -16/+17 |
| * | | | | | | fixed some bugs around with the template dropdowns | Phil Hughes | 2018-09-07 | 6 | -11/+28 |
| * | | | | | | added component specs | Phil Hughes | 2018-09-07 | 8 | -22/+345 |
| * | | | | | | regenerate gitlab.pot file | Phil Hughes | 2018-09-07 | 1 | -3/+3 |