summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add section on how we run CE->EE merge at GitLabashmckenzie/docs-ce-ee-merge-at-gitlabAsh McKenzie2019-08-131-0/+13
* Merge branch 'docs-debug-dstanley' into 'master'Evan Read2019-08-131-0/+5
|\
| * Bring resources.md from debug project to docsMarcel Amirault2019-08-131-0/+5
|/
* Merge branch 'philbz-master-patch-49694' into 'master'Drew Blessing2019-08-131-0/+30
|\
| * Update Grafana doc for security updatePhil Zona2019-08-131-0/+30
|/
* Merge branch 'docs-styleguide-lists' into 'master'Evan Read2019-08-131-11/+105
|\
| * Update list information in docs styleguideMarcel Amirault2019-08-131-11/+105
|/
* Merge branch 'patch-73' into 'master'Ray Paik2019-08-131-1/+1
|\
| * Update styleguide.md - just a little typo.David Kartuzinski2019-08-121-1/+1
* | Merge branch 'improve-quick-action-messages' into 'master'Mayra Cabrera2019-08-139-85/+91
|\ \
| * | Improve quick action error messagesHeinrich Lee Yu2019-08-139-85/+91
|/ /
* | Merge branch '63942-remove-config-action_dispatch-use_authenticated_cookie_en...Thong Kuah2019-08-124-19/+29
|\ \
| * | Enable use of Rails' new cookie encryptionHeinrich Lee Yu2019-08-134-19/+29
* | | Merge branch 'ce-12547-load-search-counts-async' into 'master'Michael Kozono2019-08-1221-180/+425
|\ \ \
| * | | Fix deprecation warning for dangerous order usageMarkus Koller2019-08-121-4/+6
| * | | FE fetch counts async on search page loadPaul Slaughter2019-08-125-4/+71
| * | | Load search result counts asynchronouslyMarkus Koller2019-08-1216-176/+352
* | | | Merge branch 'sh-fix-import-export-suggestions' into 'master'Michael Kozono2019-08-124-2/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Properly save suggestions in project exportssh-fix-import-export-suggestionsStan Hu2019-08-104-2/+28
* | | | Merge remote-tracking branch 'dev/master'John T Skarbek2019-08-122-1/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Update CHANGELOG.md for 12.0.6GitLab Release Tools Bot2019-08-121-0/+4
| * | | Update CHANGELOG.md for 11.11.8GitLab Release Tools Bot2019-08-091-0/+8
| * | | Update CHANGELOG.md for 12.1.5GitLab Release Tools Bot2019-08-093-10/+8
| * | | Merge remote-tracking branch 'dev/pokstad1-master-patch-14984'John T Skarbek2019-08-091-0/+5
| |\ \ \
| | * | | Update Gitaly to v1.53.2 for security fixPaul Okstad2019-08-012-1/+6
| * | | | Merge branch 'security-pages-api-token-recovery' into 'master'John Skarbek2019-08-092-1/+6
| |\ \ \ \
| | * | | | Fix gitlab api token recoveryVladimir Shushlin2019-08-092-1/+6
| |/ / / /
* | | | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Clement Ho2019-08-123-5/+16
|\ \ \ \ \
| * | | | | Internationalize Issue and MR list metadata stringsBrett Walker2019-08-123-5/+16
|/ / / / /
* | | | | Merge branch '65790-highlight' into 'master'Annabel Dunstone Gray2019-08-125-2/+28
|\ \ \ \ \
| * | | | | Adds highlight to collapsible lineFilipa Lacerda2019-08-125-2/+28
* | | | | | Merge branch '65530-add-externalization-and-fix-regression-in-shortcuts-helpe...Paul Slaughter2019-08-124-77/+247
|\ \ \ \ \ \
| * | | | | | Resolve "Add externalization and fix regression in shortcuts helper modal"Thomas Randolph2019-08-124-77/+247
|/ / / / / /
* | | | | | Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'Stan Hu2019-08-125-5/+10
|\ \ \ \ \ \
| * | | | | | Update GraphicsMagick from 1.3.29 to 1.3.33 for CI testsTakuya Noguchi2019-08-125-5/+10
* | | | | | | Merge branch '65278-fix-puma-master-counter-wipe' into 'master'Stan Hu2019-08-125-25/+25
|\ \ \ \ \ \ \
| * | | | | | | Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipeAleksei Lipniagov2019-08-122-6/+2
| * | | | | | | Clean prometheus dir only for master processAleksei Lipniagov2019-08-121-1/+5
| * | | | | | | Remove extra blank lineAleksei Lipniagov2019-08-121-1/+0
| * | | | | | | Fix metric files being wiped after the app startsAleksei Lipniagov2019-08-123-19/+20
* | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Clement Ho2019-08-122-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update dependency @gitlab/ui to v5.15.0Lukas Eipert2019-08-082-5/+5
* | | | | | | | | Merge branch 'jv-gitaly-1.58.0' into 'master'Stan Hu2019-08-125-44/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Gitaly server and gem to 1.58.0Jacob Vosmaer2019-08-125-44/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'georgekoltsov/63408-user-mapping' into 'master'Grzegorz Bizon2019-08-1210-21/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add code review suggestionsGeorge Koltsov2019-08-121-4/+4
| * | | | | | | | | Apply code review feedbackGeorge Koltsov2019-08-084-16/+13
| * | | | | | | | | Update project/import/bitbucket.md docGeorge Koltsov2019-08-071-5/+5
| * | | | | | | | | Add bitbucket_import/importer_spec.rb specGeorge Koltsov2019-08-074-11/+34
| * | | | | | | | | Add changelog entryGeorge Koltsov2019-08-071-0/+6