summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-082-28/+59
|\ | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * Use `#present?` instead of `defined?` in serializersGrzegorz Bizon2017-02-072-2/+2
| |
| * Simplify implementation of environments serializerGrzegorz Bizon2017-02-071-5/+4
| |
| * Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-061-3/+4
| |
| * Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-063-25/+2
| | | | | | | | | | This helps to avoid conflicts with `Paginator` class that seems to be used by some bundled libs.
| * Extend environments folders and pagination API specsGrzegorz Bizon2017-02-031-1/+1
| |
| * Order environments twice in environments serializerGrzegorz Bizon2017-02-031-0/+1
| |
| * Encapsulate reused pagination component in a classGrzegorz Bizon2017-02-023-28/+42
| |
| * Use serializer to group environments into foldersGrzegorz Bizon2017-02-021-0/+39
| |
* | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| |
* | Update changesKamil Trzcinski2017-02-061-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-062-1/+3
|\ \ | |/
| * Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+2
| |
| * Return serializable hash from a represented serializerGrzegorz Bizon2017-01-271-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-2431-16/+473
|\ \ | |/
| * Do not generate pipeline ref path if ref not presentGrzegorz Bizon2017-01-201-4/+6
| |
| * Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-184-0/+23
| |\ | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647
| | * refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-171-3/+1
| | |
| | * added new summary serializers and refactor all of the summary stuff into ↵James Lopez2017-01-172-0/+10
| | | | | | | | | | | | separate logical classes
| | * fixed stage entity and added missing stage specsJames Lopez2017-01-171-2/+2
| | |
| | * added analytics stage serializer and moved some info to the stage classes ↵James Lopez2017-01-172-0/+15
| | | | | | | | | | | | from the controller
| * | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-0/+4
| |\ \ | | |/ | |/| | | | | | | Backport timetracking to CE See merge request !8195
| | * Backport backend work for time tracking.Ruben Davila2017-01-151-0/+4
| | |
| * | Merge branch '25946-manual-pipeline-dropdown-casing' into 'master' Alfredo Sumaran2017-01-161-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | Retain original casing for build name in manual pipeline dropdown Closes #25946 See merge request !8387
| | * Retain original casing for build name in manual pipeline dropdown25946-manual-pipeline-dropdown-casingSam Rose2017-01-161-1/+1
| | |
| * | Update commit entity to point to valid commit pageGrzegorz Bizon2017-01-131-4/+4
| |/
| * Include pipeline-related resources if using relationGrzegorz Bizon2017-01-051-3/+1
| |
| * Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-051-0/+2
| |
| * Add specs for pipeline serializer with paginationGrzegorz Bizon2016-12-281-2/+5
| |
| * Fix Rubocop offenses in serializer entitiesGrzegorz Bizon2016-12-271-1/+2
| |
| * Expose stage dropdown path and title in stage entityGrzegorz Bizon2016-12-271-5/+23
| |
| * Add missing specs for CI pipeline stage entityGrzegorz Bizon2016-12-211-0/+1
| | | | | | | | [ci skip]
| * Add missing specs for request aware entity moduleGrzegorz Bizon2016-12-211-6/+3
| | | | | | | | [ci skip]
| * Rename some pipeline and build related entitiesGrzegorz Bizon2016-12-214-6/+6
| | | | | | | | [ci skip]
| * Add missing specs for new pipeline related entitiesGrzegorz Bizon2016-12-213-3/+3
| | | | | | | | [ci skip]
| * Add specs for pipeline entity and improve factoryGrzegorz Bizon2016-12-212-26/+38
| | | | | | | | [ci skip]
| * Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-211-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
| | * Add terminal UI and controller actionsFatih Acet2016-12-192-5/+9
| | |
| | * Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-191-0/+8
| | |
| * | Improve performance of Pipelines APIKamil Trzcinski2016-12-151-3/+1
| | |
| * | Fix detailed status for pipeline stage entityGrzegorz Bizon2016-12-151-1/+5
| | |
| * | Fix pipeline detailed status serializer and entitiesGrzegorz Bizon2016-12-152-3/+8
| | |
| * | Integrate new stages into ci pipeline serializerGrzegorz Bizon2016-12-092-9/+4
| | |
| * | Add status entity prototype and expose in pipelineGrzegorz Bizon2016-12-072-1/+9
| | |
| * | Add prototype of pipelines serializer with paginationGrzegorz Bizon2016-12-071-0/+34
| | |
| * | Remove support from incremental pipeline updatesGrzegorz Bizon2016-12-012-36/+7
| | |
| * | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-013-1/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) Refactor JiraService by moving code out of JiraService#execute method Rename a label to fix an intermittently-failing spec Refactor the Git submodules with CI docs Add CHANGELOG entry Improve Gitlab::GitAccessWiki spec with download access checks Improve ProjectPolicy spec to check permissions when wiki is disabled Allow access to the wiki with git when repository feature disabled Refactor branch chooser in issuable form Improve the `Gitlab::OAuth::User` error message Disable the ee_compat_check task on dev Make the downtime_check task happy Revert bump in rufus-scheduler Fix comma-dangle in function's arguments errors Improvements after review Use created date from last_deployment API: Expose branch status Grapify the files API Move task helpers to a module Fixed GFM autocomplete regex Add Human Readable Timestamp to backup tar file ...
| | * Merge branch 'fix/ca-no-date' into 'master' Douwe Maan2016-11-302-1/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * fix started_at checkJames Lopez2016-11-291-5/+1
| | | |
| | | * use an empty total time when the build has not started yet so the UI knowsJames Lopez2016-11-252-2/+6
| | | |
View Lorry Controller Status