Commit Graph

36 Commits

Author SHA1 Message Date
Douwe Maan b755bbad65 Merge branch 'fix/ca-no-date' into 'master'
fix for builds with no start date throwing an error in cycle analytics events

Instead of the error, we should inform that there is no start date

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925

See merge request !7738
2016-11-30 10:01:56 +00:00
Grzegorz Bizon 651eccda62 Expose timestamp in build entity used by serializer 2016-11-29 14:14:05 +01:00
James Lopez a32dd93a4c fix started_at check 2016-11-29 12:41:11 +01:00
James Lopez 830f739b99 use an empty total time when the build has not started yet so the UI knows 2016-11-25 11:47:33 +01:00
James Lopez 9c49fa2d92 fix for builds with no start date and spec 2016-11-25 11:47:33 +01:00
James Lopez db62eb9571 fixed bug to do with calculating durations 2016-11-22 15:05:37 +01:00
Sean McGivern 671c6d7d57 Merge branch 'ee-870-backport' into 'master'
Backport some changes done from Time Tracking feature in EE.

See merge request !7604
2016-11-21 12:54:55 +00:00
Ruben Davila 452d1d0824 Backport some changes done from Time Tracking feature in EE. 2016-11-18 21:19:04 -05:00
Kamil Trzcinski 3176e29830 Expose stop_path for environment to not construct that in frontend 2016-11-18 22:31:59 +01:00
Kamil Trzcinski b1f5af4059 Bring back the `commit_url` as it's used by CycleAnalytics 2016-11-18 22:31:26 +01:00
Kamil Trzcinski bd8d4d2eb9 Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into 22539-display-folders 2016-11-18 20:21:57 +01:00
Grzegorz Bizon 54ee0df78a Do not use absolute URLS in entities use relative 2016-11-17 16:10:12 +01:00
James Lopez ed39d61d74 refactor events facade so it uses separate classes and refactor query stuff 2016-11-17 13:22:27 +01:00
James Lopez 9e0102e494 small refactor - removing includes no longer needed 2016-11-17 08:22:59 +01:00
James Lopez cbd7d00039 added custom date helper and spec and fixed some unrelated spec failures 2016-11-17 08:22:59 +01:00
James Lopez cf2dcf043c Refactor all query config stuff into separate classes and added specs 2016-11-17 08:22:59 +01:00
James Lopez 73e9ec6319 serialize all the things! 2016-11-17 08:22:58 +01:00
James Lopez 8743e59f78 get all stages to use serlalizers - apart from plan - WIP 2016-11-17 08:22:58 +01:00
James Lopez f560099751 fix issue events and related spec - now using generic serializer for a hash 2016-11-17 08:22:58 +01:00
James Lopez 747e5c3b6f use request to pass extra parameters 2016-11-17 08:22:58 +01:00
James Lopez 6a2737e6a8 WIP - refactor events to use a generic build entity for some of the hybrid events 2016-11-17 08:22:58 +01:00
James Lopez 0ddf825ddf WIP - adding a generic entity serializer that should accept a Hash coming from Arel 2016-11-17 08:22:58 +01:00
James Lopez 3b179bc37b WIP - refactored events to use build serializer, related spec passing 2016-11-17 08:22:58 +01:00
James Lopez 81d0146c4c WIP - refactoring URL builder and events presenter into serializers 2016-11-17 08:22:58 +01:00
Grzegorz Bizon b0a4635be3 Simplify implementation of entity serializers 2016-11-04 15:00:39 +01:00
Grzegorz Bizon 3968b07d7e Add tests for serialization entities, add user entity 2016-11-04 13:08:58 +01:00
Grzegorz Bizon a2c1178c21 Expose commit author if author exists 2016-11-04 10:16:30 +01:00
Grzegorz Bizon f203ca5c93 Fix specs related to deployments and environments 2016-11-03 15:19:07 +01:00
Grzegorz Bizon 3c3e61aaca Exclude project information from environment entity 2016-11-03 14:24:10 +01:00
Grzegorz Bizon 6c94adea35 Remove project entity that was part of the PoC 2016-11-03 14:08:13 +01:00
Grzegorz Bizon c3dae798e1 Extend tests for environments serializer 2016-11-03 14:01:35 +01:00
Grzegorz Bizon 7dd6485a0f Add manual actions for deployment serialization 2016-11-03 13:43:27 +01:00
Grzegorz Bizon 52d333b9f4 Remove duplication from build serializer entity 2016-11-03 13:35:57 +01:00
Grzegorz Bizon 573921cb9d Implement entities needed for environments folders 2016-11-03 13:27:00 +01:00
Grzegorz Bizon f1e9c97d64 Use entity request object in environment entity 2016-11-02 15:00:48 +01:00
Grzegorz Bizon acfe394018 Add PoC for resource serializers 2016-11-02 14:26:57 +01:00