summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-191-2/+16
|\
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-5/+9
| |\
| * \ 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
| * | | Improve after code reviewKamil Trzcinski2016-10-171-2/+2
| * | | Add `action` and `on_stop` to `environment` in .gitlab-ci.ymlKamil Trzcinski2016-10-171-3/+11
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-175-21/+55
| |\ \ \
| * | | | Initial support for closing environmentsKamil Trzcinski2016-10-061-1/+3
* | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-181-0/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-184-12/+75
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-144-6/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0816-51/+172
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0415-121/+130
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2117-78/+470
| |\ \ \ \ \ \
| * | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+49
* | | | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-182-5/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\ \ \ \ \ \
| | * | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
* | | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* | | | | | | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* | | | | | | | Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
|/ / / / / / /
* | | | | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-131-2/+5
* | | | | | | Convert unicode emojis to images.henrik2016-10-111-1/+6
|/ / / / / /
* | | | | | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
* | | | | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-15/+31
* | | | | | Merge branch 'fix/github-importer-client' into 'master' Rémy Coutable2016-10-061-2/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
View Lorry Controller Status