summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove default scope from todosremove-default-scope-from-todosSean McGivern2018-03-053-21/+24
* Merge branch '43809-not-seeing-mentioned-in-commit-system-message-after-mergi...Robert Speicher2018-03-052-34/+47
|\
| * Fix MR merge commit cross-references to the MR itselfSean McGivern2018-03-052-34/+47
* | Merge branch 'gitaly-lfs-changes' into 'master'Douwe Maan2018-03-056-45/+170
|\ \
| * | Incorporate Gitaly's RPCs for Gitlab::Git::LfsChangesgitaly-lfs-changesAlejandro Rodríguez2018-03-026-45/+170
* | | Merge branch 'feature/add-support-for-all-option-in-count-find-commits' into ...Douwe Maan2018-03-056-185/+193
|\ \ \
| * | | Add support for :all option to {count,find}_commitsfeature/add-support-for-all-option-in-count-find-commitsAhmad Sherif2018-03-026-185/+193
* | | | Merge branch '41719-mr-title-fix' into 'master'Douwe Maan2018-03-056-91/+175
|\ \ \ \
| * | | | Match Rinku's behaviour for closing punctuation in links41719-mr-title-fixSean McGivern2018-03-022-31/+92
| * | | | Render htmlentities correctly for links not supported by RinkuJarka Kadlecová2018-02-216-66/+89
* | | | | Merge branch 'wip-slash-command-on-mr-description' into 'master'Rémy Coutable2018-03-057-15/+64
|\ \ \ \ \
| * | | | | Add "added" type on changelogOswaldo Ferreira2018-03-051-0/+1
| * | | | | Update changelogOswaldo Ferreira2018-03-051-3/+2
| * | | | | Rename quick actions handlerOswaldo Ferreira2018-03-052-3/+3
| * | | | | Move wip handling to MergeRequest::BaseServicewip-slash-command-on-mr-descriptionOswaldo Ferreira2018-03-016-1044/+25
| * | | | | /wip slash command on MR creationAdam Pahlevi2018-03-016-11/+1079
* | | | | | Merge branch '37430-projects-comparecontroller-show-is-calling-gitaly-n-1-tim...Rémy Coutable2018-03-053-9/+40
|\ \ \ \ \ \
| * | | | | | Fix n+1 issue by not reloading fully loaded blobsAlejandro Rodríguez2018-03-053-9/+40
* | | | | | | Merge branch 'feature/#43691-count-diff-note-calendar-activity' into 'master'Sean McGivern2018-03-053-5/+16
|\ \ \ \ \ \ \
| * | | | | | | #43691: DiffNotes not counted by ContributionsCalendarRiccardo Padovani2018-03-053-5/+16
|/ / / / / / /
* | | | | | | Merge branch '43837-error-handle-in-updating-milestone-on-issue' into 'master'Jacob Schatz2018-03-052-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Stop loading spinner on error of milestone update on issueTakuya Noguchi2018-03-042-0/+8
* | | | | | | | Merge branch 'backport-ee-5049-to-ce' into 'master'Douwe Maan2018-03-051-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CEbackport-ee-5049-to-ceTiago Botelho2018-03-051-2/+15
* | | | | | | | | Merge branch '41616-api-issues-between-date' into 'master'Sean McGivern2018-03-0514-14/+219
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Adds updated_at filter to issues and merge_requests APIJacopo2018-03-0514-14/+219
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'priority-changes' into 'master'Victor Wu2018-03-051-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add severity labels to contributing.mdpriority-changesVictor Wu2018-03-051-3/+14
* | | | | | | | | Merge branch 'jprovazn-scoped-limit' into 'master'Sean McGivern2018-03-058-63/+97
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use limited count queries also for scoped searchesJan Provaznik2018-03-058-63/+97
|/ / / / / / / / /
* | | | | | | | | Merge branch '42712_api_branches_add_search_param_20180207' into 'master'Rémy Coutable2018-03-054-2/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update API: add search param to branchesbunufi2018-03-054-2/+41
* | | | | | | | | | Merge branch 'an/workhorse-3.8.0' into 'master'Rémy Coutable2018-03-052-1/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Upgrade GitLab Workhorse to 3.8.0 for structured logging supportan/workhorse-3.8.0Andrew Newdigate2018-03-022-1/+6
* | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-03-051-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add a note about the "List MR pipelines" endpoint only being available from 1...Jakub Kadlubiec2018-03-051-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-fix-backup-restore-cleanup' into 'master'Rémy Coutable2018-03-051-2/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clean up backup/restore temporary directorysh-fix-backup-restore-cleanupStan Hu2018-03-021-2/+19
* | | | | | | | | | | Merge branch 'docs-darwinjs-update-ssh' into 'master'Rémy Coutable2018-03-051-4/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Docs: update ssh docMarcia Ramos2018-03-051-4/+47
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ...Rémy Coutable2018-03-059-65/+104
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-029-65/+104
* | | | | | | | | | | | Merge branch '43811-no-docker-no-put-down-the-kitchen-sink' into 'master'Rémy Coutable2018-03-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | codequality: Install jq directly instead of pulling it via dockerNick Thomas2018-03-021-1/+2
* | | | | | | | | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master'Sean McGivern2018-03-0516-60/+378
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksumsNick Thomas2018-03-0216-60/+378
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-projects-finder-from-todos-finder' into 'master'Sean McGivern2018-03-052-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't use ProjectsFinder in TodosFinderremove-projects-finder-from-todos-finderYorick Peterse2018-03-022-9/+11
* | | | | | | | | | | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-05105-8051/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | removed IDE buttonremove-idePhil Hughes2018-03-021-1/+0