summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-048-15/+70
* Merge branch 'ce-fj-refactor-change-access' into 'master'Douwe Maan2018-12-0417-502/+690
|\
| * CE port Refactor Gitlab::Checks::ChangeAccess classFrancisco Javier López2018-12-0417-502/+690
|/
* Merge branch 'legacy_fallback_for_project_clusters_only' into 'master'Kamil Trzciński2018-12-044-4/+41
|\
| * Fallback to admin token for project clusters onlyThong Kuah2018-12-044-4/+41
* | Merge branch 'winh-collapse-discussions' into 'master'Fatih Acet2018-12-044-62/+35
|\ \
| * | Fix collapsing discussion repliesWinnie Hellmann2018-12-044-62/+35
|/ /
* | Merge branch 'revert-db6cedda' into 'master'Kamil Trzciński2018-12-043-39/+0
|\ \
| * | Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into ...Fabio Busatto2018-12-043-39/+0
* | | Merge branch '5426-fe-web-terminal-empty-state-ce' into 'master'Phil Hughes2018-12-042-5/+0
|\ \ \
| * | | Remove alert-tip from framework cssPaul Slaughter2018-12-032-5/+0
* | | | Merge branch 'update-variable-name' into 'master'Phil Hughes2018-12-041-1/+1
|\ \ \ \
| * | | | Update -font-size variable nameAnnabel Dunstone Gray2018-12-031-1/+1
| |/ / /
* | | | Merge branch 'dm-default-request-format-html' into 'master'Sean McGivern2018-12-048-62/+33
|\ \ \ \
| * | | | Disable format determination based on path extensionDouwe Maan2018-12-032-0/+24
| * | | | Revert "Rails5 fix format in uploads actions"Douwe Maan2018-12-031-13/+0
| * | | | Revert "[Rails5] Set request.format in commits_controller"Douwe Maan2018-12-031-14/+0
| * | | | Revert "[Rails5] Set request.format for artifacts_controller"Douwe Maan2018-12-031-9/+0
| * | | | Revert "[Rails5] Explicitly set request.format for blob_controller"Douwe Maan2018-12-031-13/+0
| * | | | Revert "Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/proj...Douwe Maan2018-12-032-13/+9
* | | | | Merge branch 'docs-update-expect_next_instance_of' into 'master'Sean McGivern2018-12-041-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make docs about expect_next_instance_of consistentLin Jen-Shin2018-12-031-3/+3
* | | | | Merge branch 'ab-approximate-counts' into 'master'Stan Hu2018-12-049-98/+381
|\ \ \ \ \
| * | | | | Lower the tablesample thresholds/targets.Andreas Brandl2018-12-031-2/+2
| * | | | | Add changelog.Andreas Brandl2018-12-031-0/+5
| * | | | | Move strategies in their own filesAndreas Brandl2018-12-038-279/+323
| * | | | | Fix comment.Andreas Brandl2018-12-031-1/+1
| * | | | | Refactor estimate queryAndreas Brandl2018-12-031-19/+18
| * | | | | Limit some specs to PostgreSQL only.Andreas Brandl2018-12-031-2/+2
| * | | | | Fix rubocop offenses.Andreas Brandl2018-12-032-7/+9
| * | | | | Add feature flag for tablesample counting.Andreas Brandl2018-12-032-0/+8
| * | | | | Implement TablesampleCountStrategy.Andreas Brandl2018-12-032-20/+161
| * | | | | Finish refactoring specs.Andreas Brandl2018-12-031-56/+15
| * | | | | Move things to their right scope in specs.Andreas Brandl2018-12-031-44/+45
| * | | | | More specs for fallback testing.Andreas Brandl2018-12-032-0/+36
| * | | | | Refactor specs to separate concerns.Andreas Brandl2018-12-032-27/+64
| * | | | | Flexible approximate counts with fallback strategies.Andreas Brandl2018-12-032-21/+32
| * | | | | Simplify to use models instead of tables.Andreas Brandl2018-12-032-25/+25
| * | | | | Add ExactCountStrategy.Andreas Brandl2018-12-032-0/+23
| * | | | | Extract ReltuplesCountStrategy.Andreas Brandl2018-12-032-21/+38
* | | | | | Merge branch 'document-raw-snippet-api' into 'master'Evan Read2018-12-042-8/+37
|\ \ \ \ \ \
| * | | | | | Fix lack of documentation on how to fetch a snippet's content using APIcolinleroy2018-12-042-8/+37
|/ / / / / /
* | | | | | Merge branch 'sh-update-api-archive-docs' into 'master'Evan Read2018-12-041-2/+6
|\ \ \ \ \ \
| * | | | | | Fix documentation for /api/v4/projects/:id/repository/archiveStan Hu2018-12-031-2/+6
* | | | | | | Merge branch 'patch-28' into 'master'Evan Read2018-12-031-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Rollback will not work because Envoy will still fetch latest commit from the ...Muhammad Nuzaihan2018-12-011-1/+5
| |/ / / / / /
* | | | | | | Merge branch 'docs-auto-devops-migration-improve' into 'master'Evan Read2018-12-031-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Auto Devops migrate: add two release infoThong Kuah2018-12-031-2/+11
* | | | | | | | Update CHANGELOG.md for 11.5.2GitLab Release Tools Bot2018-12-036-25/+16
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch '54048-Line-numbers-are-misaligned-in-file-blame-view' into 'mas...Annabel Dunstone Gray2018-12-032-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |