summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a spec for ProjectsFinder project_ids_relation optionfix/slow-todosAhmad Sherif2016-08-121-0/+8
* Fix ProjectsFinder specAhmad Sherif2016-08-121-57/+12
* Pass project IDs relation to ProjectsFinder instead of using a blockAhmad Sherif2016-08-122-5/+3
* Speed up todos queries by limiting the projects set we join withAhmad Sherif2016-08-123-11/+13
* Merge branch 'instrument-project-visible-to-user' into 'master' Rémy Coutable2016-08-122-0/+4
|\
| * Instrument Project.visible_to_userYorick Peterse2016-08-122-0/+4
* | Merge branch 'improve-pipeline-processing' into 'master' Rémy Coutable2016-08-1212-113/+214
|\ \ | |/ |/|
| * Fix build play failureimprove-pipeline-processingKamil Trzcinski2016-08-121-1/+1
| * Improve transition between states for event `enqueue`Kamil Trzcinski2016-08-121-1/+1
| * Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-126-23/+34
| * Fix test failuresKamil Trzcinski2016-08-122-2/+2
| * Added specs for started_at and finished_atKamil Trzcinski2016-08-122-15/+46
| * Use explicit events to transition between statesKamil Trzcinski2016-08-122-13/+33
| * Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-123-4/+30
| |\
| * \ Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-1231-208/+362
| |\ \
| * | | Fix test failures, that did occur because of missing previously used `reload_...Kamil Trzcinski2016-08-117-56/+60
| * | | Use state machine for pipeline event processingKamil Trzcinski2016-08-119-71/+54
| * | | Verify the pipeline status after executing events on buildsKamil Trzcinski2016-08-113-1/+53
* | | | Merge branch 'update-performance-guide' into 'master' Achilleas Pipinellis2016-08-121-5/+4
|\ \ \ \
| * | | | Corrected links/usernames in performance guideupdate-performance-guideYorick Peterse2016-08-111-5/+4
* | | | | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
* | | | | Merge branch '19725-new-pipeline-auto-completion' into 'master' Robert Speicher2016-08-113-4/+30
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update CHANGELOGula budziszewska2016-08-111-1/+0
| * | | | render only commit titleubudzisz2016-08-113-3/+30
|/ / / /
* | | | Merge branch 'gitlab-shell-3-3-3' into 'master' Douwe Maan2016-08-112-2/+2
|\ \ \ \
| * | | | Update gitlab-shell to v3.3.3Douwe Maan2016-08-112-2/+2
* | | | | Merge branch 'rails-4-2-7-1' into 'master' Robert Speicher2016-08-112-32/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea2016-08-112-32/+32
|/ / / /
* | | | Merge branch 'feature/merge-request-link-after-push' into 'master' Douwe Maan2016-08-1111-23/+254
|\ \ \ \
| * | | | api for generating new merge requestScott Le2016-08-1111-23/+254
* | | | | Merge branch 'ruby-2-3-lets-not-break-things' into 'master' Douwe Maan2016-08-114-48/+48
|\ \ \ \ \
| * | | | | Target 8.11 for CHANGELOG entry Ruby 2.3Z.J. van de Weg2016-08-111-2/+1
| * | | | | Update currently supported Ruby version info.Connor Shea2016-08-112-1/+3
| * | | | | Update gitlab ci tests to test ruby 2.1 now tooZ.J. van de Weg2016-08-111-1/+1
| * | | | | Update docs to reference Ruby 2.3.1Connor Shea2016-08-111-7/+6
| * | | | | Default build tests ruby 2.3.1Z.J. van de Weg2016-08-112-41/+41
* | | | | | Merge branch 'remove-schedules' into 'master' Sid Sijbrandij2016-08-111-5/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | editremove-schedulesErnst van Nierop2016-04-131-1/+1
| * | | | | remove need for schedulesernstvn2016-04-121-5/+9
* | | | | | Merge branch '20614-show-member-roles-to-all-users' into 'master' Robert Speicher2016-08-116-84/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-116-84/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-118-14/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-118-14/+15
* | | | | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-1112-716/+433
|\ \ \ \ \
| * | | | | Fix typoJacob Vosmaer2016-08-111-1/+1
| * | | | | Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-102-9/+17
| * | | | | Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3
| * | | | | Rename lfs_enabled helper methodJacob Vosmaer2016-08-103-3/+3
| * | | | | Remove duplicate method reintroduced by mergeJacob Vosmaer2016-08-091-4/+0