summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43140-reduce-logs-tree-load' into 'master'51201-document-review-appsRémy Coutable2018-09-067-38/+368
|\
| * Properly fix an introduced N+1 SQL issue loading commit authorsNick Thomas2018-09-062-6/+4
| * Add changelogNick Thomas2018-09-061-0/+5
| * Extract tree summary logic out of RefsController#logs_treeNick Thomas2018-09-063-45/+337
| * Deduplicate commits before rendering them in RefsController#logs_treeNick Thomas2018-09-061-14/+19
| * Bulk-render commit titles in the tree view to improve performanceNick Thomas2018-09-064-4/+34
* | Merge branch '50657-migrate-issue-labels-and-milestone-to-related-mr-on-creat...Nick Thomas2018-09-067-19/+61
|\ \
| * | Resolve "Migrate issue labels and milestone to related merge request"Tiago Botelho2018-09-067-19/+61
|/ /
* | Merge branch '46340-remove-extra-spaces-from-mr-discussion-notes-after-vuejs'...Annabel Dunstone Gray2018-09-067-33/+17
|\ \
| * | Remove extra spaces from MR discussion notesTakuya Noguchi2018-09-057-33/+17
* | | Merge branch '50695-ce-documentation-is-not-commonmark-compliant-docs' into '...Sean McGivern2018-09-06105-1734/+1809
|\ \ \
| * | | Resolve "CE documentation is not CommonMark compliant"Brett Walker2018-09-06105-1734/+1809
|/ / /
* | | Merge branch 'ccr/6699_image_for_object_error' into 'master'Robert Speicher2018-09-063-0/+22
|\ \ \
| * | | Handled exception during file uploadChantal Rollison2018-09-063-0/+22
* | | | Merge branch 'fix-closing-issues' into 'master'Sean McGivern2018-09-065-4/+16
|\ \ \ \
| * | | | Fix closing issue default patternSamuele Kaplun2018-09-065-4/+16
* | | | | Merge branch '50567-remove-usage-ping-payload-from-cohorts-add-to-settings' i...Phil Hughes2018-09-0619-70/+225
|\ \ \ \ \
| * | | | | Resolve "Remove usage ping payload from Cohorts, add to Settings"Luke Bennett2018-09-0619-70/+225
|/ / / / /
* | | | | Merge branch 'feature/recognize-unlicense' into 'master'Rémy Coutable2018-09-063-2/+11
|\ \ \ \ \
| * | | | | Recognize 'UNLICENSE' license filesJ.D. Bean2018-09-063-2/+11
|/ / / / /
* | | | | Merge branch '51117-send-terminal-path-in-job-api' into 'master'Kamil Trzciński2018-09-064-48/+52
|\ \ \ \ \
| * | | | | Add terminal path to job API responseSteve Azzopardi2018-09-064-48/+52
| |/ / / /
* | | | | Merge branch '51092-fix-mr-diff-file-filter-clear-button' into 'master'Phil Hughes2018-09-063-1/+10
|\ \ \ \ \
| * | | | | Make MR diff file filter input Clear button functionalKushal Pandya2018-09-063-1/+10
|/ / / / /
* | | | | Merge branch 'feature/git-v2-flag' into 'master'Nick Thomas2018-09-062-1/+6
|\ \ \ \ \
| * | | | | Add git_v2 flag to GitalyClientJames Lopez2018-09-062-1/+6
|/ / / / /
* | | | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-0611-10/+87
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-0511-10/+87
* | | | | Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master'Sean McGivern2018-09-066-36/+147
|\ \ \ \ \
| * | | | | Custom Action support changelogAsh McKenzie2018-09-061-0/+5
| * | | | | Update /api/v4/allowedAsh McKenzie2018-09-063-38/+103
| * | | | | GitAccess#check custom action supportAsh McKenzie2018-09-061-1/+9
| * | | | | New GitAccessResult::Success/CustomActionAsh McKenzie2018-09-062-0/+33
* | | | | | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-069-183/+216
|\ \ \ \ \ \
| * | | | | | Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-069-183/+216
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '29398-support-kubernetes-rbac-for-gitlab-managed-apps' into 'ma...Kamil Trzciński2018-09-0644-93/+1302
|\ \ \ \ \ \
| * | | | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-0644-93/+1302
|/ / / / / /
* | | | | | Merge branch 'docs/usage-statistics-typo' into 'master'Marcia Ramos2018-09-061-2/+4
|\ \ \ \ \ \
| * | | | | | Add link to EE MRAchilleas Pipinellis2018-09-061-0/+1
| * | | | | | link formatting and typoJames Komara2018-09-061-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch '44943-update-presentation-for-sso-providers-on-log-in-page' int...Phil Hughes2018-09-0618-51/+57
|\ \ \ \ \ \
| * | | | | | Resolve "Update presentation for SSO providers on log in page"Martin Wortschack2018-09-0618-51/+57
|/ / / / / /
* | | | | | Merge branch 'rails5-explicit-hashed-path-check' into 'master'Rémy Coutable2018-09-062-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Explicit hashed path check for trace, prevents background migration from acce...Jasper Maes2018-09-052-1/+9
* | | | | | Merge branch 'sh-add-ua-to-lograge-logs' into 'master'Sean McGivern2018-09-063-1/+8
|\ \ \ \ \ \
| * | | | | | Add User-Agent to production_json.logStan Hu2018-09-053-1/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'bw-commonmark-for-files-docs' into 'master'Sean McGivern2018-09-061-8/+38
|\ \ \ \ \ \
| * | | | | | Update user markdown documentation for CommonMarkBrett Walker2018-09-061-8/+38
|/ / / / / /
* | | | | | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-0625-52/+285
|\ \ \ \ \ \
| * | | | | | remove guard clause and add comment on performaceBrett Walker2018-09-051-3/+7