summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-101-1/+1
|\
| * Created group_icon and group_icon_urlTim Zallmann2017-10-041-1/+1
* | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-062-0/+13
|\ \
| * \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-071-2/+6
| |\ \
| * \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-061-0/+1
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-055-2/+68
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+1
| * | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-032-0/+13
* | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Disable comment form when discussion locked for userJarka Kadlecova2017-09-261-1/+1
| * | | | | Expose discussion_locked for issue_entityLuke "Jared" Bennett2017-09-141-0/+1
* | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-061-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Expose failure reason in pipeline error badgeGrzegorz Bizon2017-10-051-2/+6
| | |_|/ / | |/| | |
* | | | | Merge branch '38389-allow-merge-without-success' into 'master'Fatih Acet2017-10-051-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-0/+1
| |/ / /
* | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-051-1/+1
|/ / /
* | | Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-044-0/+68
|\ \ \
| * | | Add ContainerTag and ContainerRepository frontend APIKamil Trzcinski2017-09-214-0/+68
| |/ /
* | | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-2/+0
|\ \ \ | |_|/ |/| |
| * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-2/+0
| |/
* | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+1
* | Port fast-forward MR widget states from EEEric Eastwood2017-09-191-1/+0
* | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+5
|/
* Implemented the new Description ContentTim Zallmann2017-09-121-1/+1
* Fixed the URL + renamed to Job FailedTim Zallmann2017-09-121-2/+2
* Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-072-3/+7
* Use hook for setting Pipeline config_sourceZeger-Jan van de Weg2017-09-061-1/+1
* Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0410-2/+111
|\
| * Fix specsDouwe Maan2017-08-301-2/+2
| * 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
| |\
| * | 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
| |\ \
| * \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-086-1/+69
| |\ \ \
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-312-2/+3
| |\ \ \ \
| * | | | | 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
* | | | | | Add config_source to ci_pipelinesZeger-Jan van de Weg2017-08-311-0/+1
| |_|_|_|/ |/| | | |
* | | | | 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
|/ / / /
* | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-083-3/+3
| |_|/ |/| |
* | | 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
| | |/ | |/|
View Lorry Controller Status