summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Make retry_lock to not be infiniteuse-optimistic-lockingKamil Trzcinski2016-10-271-3/+7
* Add tests for optimistic lockingKamil Trzcinski2016-10-261-5/+7
* Use optimistic lockingKamil Trzcinski2016-10-261-0/+13
* Merge branch 'fix-events-api' into 'master' Rémy Coutable2016-10-251-2/+2
|\
| * Get rid of extra .page callAirat Shigapov2016-10-241-2/+1
| * Fix events order in user contributions APIAirat Shigapov2016-10-241-1/+2
* | Don't schedule ProjectCacheWorker unless neededproject-cache-worker-schedulingYorick Peterse2016-10-251-1/+8
* | Merge branch '23372-fix-ce-to-ee-merge-check-task' into 'master' Robert Speicher2016-10-254-101/+277
|\ \
| * | Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-taskRémy Coutable2016-10-241-0/+1
| * | Use File.write instead of File.open + File#writeRémy Coutable2016-10-241-1/+1
| * | Don't print out implementation detail stepRémy Coutable2016-10-241-1/+1
| * | Change the approach to check if patches apply cleanlyRémy Coutable2016-10-214-101/+276
* | | Escape ref and path for relative links (!6050)winniehell2016-10-241-2/+2
| |/ |/|
* | Merge branch 'grapify-labels-api' into 'master' Rémy Coutable2016-10-241-53/+38
|\ \
| * | Grapify the labels APIgrapify-labels-apiRobert Schilling2016-10-241-53/+38
* | | Merge branch 'grapify-builds-api' into 'master' Rémy Coutable2016-10-241-83/+79
|\ \ \
| * | | Grapify builds APIgrapify-builds-apiRobert Schilling2016-10-241-83/+79
| |/ /
* | | Added path parameter to Commits APILuis HGO2016-10-241-0/+2
* | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-241-33/+15
|\ \ \
| * | | Implement second round of review comments from @DouweM.Timothy Andrew2016-10-241-6/+3
| * | | Implement review comments from @DouweM.Timothy Andrew2016-10-241-2/+2
| * | | Fix branch protection API.Timothy Andrew2016-10-241-31/+16
| |/ /
* | | Add relative url support to routing contrainersDmitriy Zaporozhets2016-10-241-1/+12
|/ /
* | 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