summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adds the functionality to convert a non-discussion into a discussion30299-convert-non-discussion-into-discussionTiago Botelho2018-08-278-1/+89
* Merge branch 'sh-simplify-github-importer-refactor' into 'master'Yorick Peterse2018-08-249-133/+173
|\
| * Refactor GitHub Importer database helpers into helper methodsStan Hu2018-08-249-133/+173
* | Merge branch 'mkoszut-master-patch-04745' into 'master'Rémy Coutable2018-08-241-10/+10
|\ \
| * | Removing not necessarily indentations in update Ruby code blockMateusz2018-08-231-10/+10
* | | Merge branch 'fix/contributing' into 'master'Rémy Coutable2018-08-241-1/+1
|\ \ \
| * | | Update CONTRIBUTING.mdFranklin Yu2018-08-231-1/+1
* | | | Merge branch 'api-labels-spec' into 'master'Rémy Coutable2018-08-241-4/+4
|\ \ \ \
| * | | | POST should be PUT in the API labels specsRobert Schilling2018-08-241-4/+4
* | | | | Merge branch 'patch-28' into 'master'Stan Hu2018-08-241-0/+1
|\ \ \ \ \
| * | | | | Add link to Profiling doc to READMETom Atkins2018-08-241-0/+1
|/ / / / /
* | | | | Merge branch 'ccr/43283_allow_author_upvote' into 'master'Sean McGivern2018-08-2413-91/+31
|\ \ \ \ \
| * | | | | Allows author to vote on their own issueChantal Rollison2018-08-2413-91/+31
|/ / / / /
* | | | | Merge branch 'patch-29' into 'master'Sean McGivern2018-08-241-23/+25
|\ \ \ \ \
| * | | | | Gitaly needs to be installed before initializing databaseAniela Ziółkowski2018-08-231-22/+22
| * | | | | Update installation.mdAniela Ziółkowski2018-08-231-1/+3
* | | | | | Merge branch 'sh-fix-issue-50562' into 'master'Rémy Coutable2018-08-245-0/+28
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix remote mirrors failing if Git remotes have not been addedStan Hu2018-08-225-0/+28
* | | | | | Merge branch 'winh-fix-dummy-badge-id' into 'master'Fatih Acet2018-08-231-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use _.uniqueId() instead of Math.random() for dummy badgesWinnie Hellmann2018-08-231-1/+2
|/ / / / /
* | | | | Merge branch '6965-backport-to-ce' into 'master'Stan Hu2018-08-234-79/+118
|\ \ \ \ \
| * | | | | Backport LDAP changes to CEDouglas Barbosa Alexandre2018-08-234-79/+118
* | | | | | Merge branch '43096-controller-projects-issuescontroller-referenced_merge_req...Nick Thomas2018-08-2310-188/+222
|\ \ \ \ \ \
| * | | | | | Only load issue notes once when getting related MRs43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queriesSean McGivern2018-08-212-4/+17
| * | | | | | Add changelog entry for related MRs fixesSean McGivern2018-08-211-0/+5
| * | | | | | Fix CI pipelines N+1 in Issues::ReferencedMergeRequestsServiceSean McGivern2018-08-212-4/+26
| * | | | | | Fix routes N+1 in Issues::ReferencedMergeRequestsService#executeSean McGivern2018-08-212-2/+16
| * | | | | | Fix authors N+1 in Issues::ReferencedMergeRequestsServiceSean McGivern2018-08-212-15/+37
| * | | | | | Move Issue#{referenced,closed_by}_merge_requests to serviceSean McGivern2018-08-218-186/+144
* | | | | | | Merge branch 'remove-scss-variables-5' into 'master'Dmitriy Zaporozhets2018-08-2317-118/+55
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Finish cleaning up reassigned variablesAnnabel Dunstone Gray2018-08-2217-118/+55
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'docs-update-prod-architecture-links' into 'master'Nick Thomas2018-08-231-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixes doc/development/architecture.md prod links.Jamie Gordon2018-07-061-2/+2
* | | | | | Merge branch 'sh-limit-commit-renderering' into 'master'Sean McGivern2018-08-2313-19/+112
|\ \ \ \ \ \
| * | | | | | Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-2213-19/+112
* | | | | | | Merge branch 'ccr/48800/ping_for_boards' into 'master'Sean McGivern2018-08-235-0/+29
|\ \ \ \ \ \ \
| * | | | | | | Added count for label, assignee, and milestone listsccr/48800/ping_for_boardsChantal Rollison2018-08-215-0/+29
* | | | | | | | Merge branch 'jprovazn-fix-form-uploads' into 'master'Kamil Trzciński2018-08-233-3/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add public/uploads/tmp to allowed upload pathsjprovazn-fix-form-uploadsJan Provaznik2018-08-213-3/+32
| |/ / / / / /
* | | | | | | Update CHANGELOG.md for 11.2.1GitLab Release Tools Bot2018-08-224-15/+12
* | | | | | | Merge branch 'sh-fix-broken-ldap-clones' into 'master'Alejandro Rodríguez2018-08-223-0/+48
|\ \ \ \ \ \ \
| * | | | | | | Fix broken Git over HTTP clones with LDAP usersStan Hu2018-08-223-0/+48
* | | | | | | | Merge branch 'sh-fix-wrong-commit-count-in-push' into 'master'Alejandro Rodríguez2018-08-223-13/+46
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix wrong commit count in push event payloadStan Hu2018-08-223-13/+46
|/ / / / / / /
* | | | | | | Merge branch 'sh-improve-system-hook-spec' into 'master'Stan Hu2018-08-221-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Improve system hook spec in spec/services/git_push_service_spec.rbStan Hu2018-08-221-3/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dz-bump-gitlab-svg' into 'master'50575-instance-statistics-should-be-available-without-usage-pingFilipa Lacerda2018-08-222-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update gitlab-svgs to 1.2.8Dmitriy Zaporozhets2018-08-222-2/+6
|/ / / / /
* | | | | Merge branch 'sh-conditional-system-hook-push' into 'master'Sean McGivern2018-08-223-4/+12
|\ \ \ \ \
| * | | | | Eliminate unnecessary and duplicate system hook firesStan Hu2018-08-213-4/+12