summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Expand)AuthorAgeFilesLines
* Misc tweaksDouwe Maan2017-08-173-11/+5
* Return null attachment when there is noneDouwe Maan2017-08-171-1/+1
* Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-172-2/+15
|\
| * Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-161-1/+1
| |\
| | * Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-152-2/+2
| * | Many Repo FixesJacob Schatz2017-08-151-1/+14
| |/
* | Use UserNoteEntity instead of UserEntity for notesJarka Kadlecova2017-08-113-4/+11
* | Fix failing static-analysis (rubocop)Jarka Kadlecova2017-08-112-4/+4
* | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-103-3/+3
|\ \ | |/
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-083-3/+3
* | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-086-1/+69
|\ \ | |/
| * Merge branch 'master' into ideMike Greiling2017-08-071-1/+1
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-1/+1
| * | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-282-2/+3
| |\ \ | | |/
| * | Used new tree and blob entity path helpersLuke "Jared" Bennett2017-07-202-2/+2
| * | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2013-88/+36
| |\ \
| * | | Expose last_commit information for tree and blob when serializedDmitriy Zaporozhets2017-06-222-0/+8
| * | | Merge remote-tracking branch 'origin/master' into dm-tree-jsonDmitriy Zaporozhets2017-06-2220-37/+230
| |\ \ \
| * | | | Add experimental JSON format for tree controllerDouwe Maan2017-05-265-0/+60
* | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-312-2/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into...Sean McGivern2017-07-261-1/+1
| |\ \ \ \
| | * | | | Pending delete projects should not show in deploy keys35338-deploy-keys-should-not-show-pending-delete-projectsTiago Botelho2017-07-251-1/+1
| | | |_|/ | | |/| |
| * | | | Fix target project merge request link on build pagefix/gb/fix-build-merge-request-link-to-fork-projectGrzegorz Bizon2017-07-211-1/+2
| * | | | Fix job merge request link to a forked source projectGrzegorz Bizon2017-07-191-1/+1
| |/ / /
* | | | Remove noteable ID and type from IssueEntity create_note_pathDouwe Maan2017-07-211-1/+1
* | | | Fix IssueEntity create_note_pathDouwe Maan2017-07-211-1/+1
* | | | Remove duplicate attributes from discussion entity and move note.can_edit int...Douwe Maan2017-07-212-12/+4
* | | | Add data required for note formDouwe Maan2017-07-213-2/+23
* | | | Add full JSON endpoints for issue notes and discussionsDouwe Maan2017-07-217-0/+95
|/ / /
* | | Make commits behind text a link to the target branch commits pageClement Ho2017-07-111-0/+4
* | | Convert target branch link to use treeClement Ho2017-07-111-2/+2
* | | Fix dashboard labels dropdownNick Thomas2017-07-071-1/+2
* | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-0512-87/+30
| |/ |/|
* | Improve method names and add more specsFelipe Artur2017-06-161-1/+0
* | Expose correct path to groupAlfredo Sumaran2017-06-161-1/+5
* | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-145-12/+9
|\ \
| * \ Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-145-7/+7
| |\ \
| | * | Rename BuildEntity to JobEntityKamil Trzcinski2017-06-135-7/+7
| | * | Fix support for external_url for commit statusesKamil Trzcinski2017-06-131-1/+1
| * | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-5/+2
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-137-9/+92
|\ \ \ | |/ /
| * | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-122-5/+15
| * | Expose human group access on GroupEntityDouwe Maan2017-06-071-2/+2
| * | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-071-2/+2
| * | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0711-24/+135
| |\ \
| | * \ Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-0/+7
| | |\ \
| | | * | Implement ability to update deploy keysAlexander Randa2017-06-021-0/+7
| | * | | Merge branch 'issue_27166_2' into 'master'Douwe Maan2017-06-071-3/+4
| | |\ \ \
| | | * | | Avoid repeated queries for pipeline builds on merge requestsissue_27166_2Felipe Artur2017-06-061-3/+4
| | * | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0513-28/+138
| | |\ \ \ \
View Lorry Controller Status