summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-broken-label-controller' into 'master' Rémy Coutable2016-10-221-1/+1
|\
| * Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-1/+1
* | Merge branch '23653-dont-clear-db-cache-every-release' into 'master' Yorick Peterse2016-10-221-1/+1
|\ \
| * | Stop clearing the database cache on rake cache:clearNick Thomas2016-10-221-1/+1
| |/
* | Fix documents and comments on Build API `scope`. #23146 #19131Lemures Lemniscati2016-10-221-2/+2
|/
* Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-b...Valery Sizov2016-10-211-0/+2
|\
| * Fix: Backup restore doesn't clear cache12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tagsValery Sizov2016-10-201-0/+2
* | Don't use Hash#slice since it's not supported in Ruby 2.1fix-ruby-2-1-failuresRémy Coutable2016-10-201-3/+8
* | Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-202-7/+10
|\ \ | |/
| * Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-201-5/+1
| |\
| | * Refactoring find_commits functionalityValery Sizov2016-10-201-5/+1
| * | Differentiate the expire from leave eventCallum Dryden2016-10-201-2/+9
* | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-201-1/+3
|/ /
* | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-1916-81/+160
|\ \
| * | Use LabelsFinder on Fogbuz importerDouglas Barbosa Alexandre2016-10-191-1/+2
| * | Use LabelsFinder on Google Code importerDouglas Barbosa Alexandre2016-10-191-1/+2
| * | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-194-4/+4
| * | Update specs to cope with new label types and prioritiesJames Lopez2016-10-194-12/+27
| * | Fix GitHub importer specDouglas Barbosa Alexandre2016-10-191-1/+4
| * | User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-194-9/+10
| * | Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-7/+1
| * | Remove Issuable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-192-26/+18
| * | List all available labels to the project on the labels APIDouglas Barbosa Alexandre2016-10-191-1/+1
| * | Add support to group labels on issues board APIDouglas Barbosa Alexandre2016-10-191-2/+2
| * | Validate label params against all labels available to project on the APIDouglas Barbosa Alexandre2016-10-191-10/+9
| * | Move label management to services on merge requests APIDouglas Barbosa Alexandre2016-10-191-11/+4
| * | Keep cross project reference logic in GroupLabel#to_referenceDouglas Barbosa Alexandre2016-10-191-9/+1
| * | Fix replace label references with links for group labelsDouglas Barbosa Alexandre2016-10-191-1/+7
| * | Use try instead of ternary operator on Gitlab::ImportExport::ProjectTreeRestorerDouglas Barbosa Alexandre2016-10-191-2/+1
| * | Reuse LabelsFinder on Issueable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-193-4/+4
| * | Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-7/+5
| * | Fix import/export labels to cope with project and group labels. Added relevan...James Lopez2016-10-194-5/+26
| * | Fix import testJames Lopez2016-10-192-3/+6
| * | Unfold references for group labels when moving issue to another projectDouglas Barbosa Alexandre2016-10-192-4/+53
| * | Add Lavel#type to methods in lib/gitlab/import_export/import_export.ymlDouglas Barbosa Alexandre2016-10-191-0/+2
| * | Add ProjectLabel modelDouglas Barbosa Alexandre2016-10-192-2/+2
| * | Replace label references with links for group labelsDouglas Barbosa Alexandre2016-10-191-3/+13
* | | Merge branch 'issue_828' into 'master' Douwe Maan2016-10-193-15/+38
|\ \ \ | |/ / |/| |
| * | Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-193-15/+38
* | | Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-191-1/+1
|\ \ \ | |/ / |/| |
| * | fix: commit messages being double-escaped in activies tabamaia2016-10-181-1/+1
* | | Merge branch 'grapify-commit-statuses-api' into 'master' Rémy Coutable2016-10-191-26/+27
|\ \ \
| * | | Grapify the commit status APIgrapify-commit-statuses-apiRobert Schilling2016-10-191-26/+27
* | | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-191-6/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-141-6/+4
* | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-2/+46
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-5/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-0/+30
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-184-12/+75
| |\ \ \ \
| * | | | | Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-171-0/+4