summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-3/+12
* Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-4/+4
* Cache imported GH labels no matter whatfix/gh-imported-labels-are-not-applied-correctlyAhmad Sherif2016-11-041-6/+3
* Fix applying GitHub-imported labels when importing job is interruptedAhmad Sherif2016-11-041-0/+10
* Show log corresponding to env in admin/logsLukas Erlacher2016-11-031-2/+2
* Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-033-3/+24
* Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-033-12/+29
* Fix project features default valuesFelipe Artur2016-11-011-0/+8
* Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
* Merge branch 'adam-fix-labels-find-or-create' into 'master' Douwe Maan2016-10-284-7/+7
|\
| * Pass user instance to Labels::FindOrCreateService or skip_authorization: trueadam-fix-labels-find-or-createAdam Niedzielski2016-10-284-7/+7
* | Merge branch 'use-optimistic-locking' into 'master' Stan Hu2016-10-281-0/+19
|\ \
| * | 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
* | | Fix typosfix/make-github-import-retryableAhmad Sherif2016-10-282-2/+2
* | | Abstract the use of imported[!?] and {current,increment}_page in GitHub importerAhmad Sherif2016-10-281-50/+34
* | | Use public_send instead of sendAhmad Sherif2016-10-281-1/+1
* | | Modify GitHub importer to be retryableAhmad Sherif2016-10-287-25/+130
* | | Merge branch 'fix/gh-import-bugs' into 'master' Sean McGivern2016-10-282-13/+23
|\ \ \ | |_|/ |/| |
| * | Fix importing MR comments from GitHubfix/gh-import-bugsAhmad Sherif2016-10-271-6/+7
| * | Fix applying labels for GitHub-imported MRsAhmad Sherif2016-10-272-7/+16
| |/
* | Merge branch '21645-mail_room_sentinel'Douwe Maan2016-10-272-1/+14
|\ \ | |/ |/|
| * Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinelGabriel Mazetto2016-10-262-1/+14
* | 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-251-0/+261
|\
| * 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-211-0/+260
* | Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-221-1/+1
|/
* Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-201-5/+1
|\
| * Merge branch 'refactoring_find_commits_method' into 'master' Sean McGivern2016-10-201-5/+1
| |\
| | * Refactoring find_commits functionalityValery Sizov2016-10-201-5/+1
* | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-201-1/+3
|/ /
* | 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
* | Remove Issuable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-192-26/+18
* | Keep cross project reference logic in GroupLabel#to_referenceDouglas Barbosa Alexandre2016-10-191-9/+1
* | 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-192-2/+2
* | 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-191-1/+17
* | 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-191-1/+1
|/
View Lorry Controller Status