summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Send continue parameter on for cancel_pathSteve Azzopardi2018-10-311-4/+12
| | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* post merge pipeline and environments statusAlessio Caiazza2018-10-292-0/+2
|
* Move job stuck status to backendSteve Azzopardi2018-10-251-0/+1
|
* Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-233-1/+19
| | | | requests"
* Show modified and added public paths in MRAlessio Caiazza2018-10-181-0/+2
|
* Move ci_environments_status to a modelAlessio Caiazza2018-10-182-0/+65
| | | | | | | | GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* Merge branch '52669-fixes-quick-actions-preview' into 'master'Douglas Barbosa Alexandre2018-10-152-2/+2
|\ | | | | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requests Closes #52669 See merge request gitlab-org/gitlab-ce!22343
| * Fixes close/reopen quick actions preview for issues and merge_requestsJacopo2018-10-152-2/+2
| | | | | | | | | | Close/reopen quick actions preview wasn't shown properly, now the preview is shown as expected.
* | Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon2018-10-151-1/+1
|\ \ | |/ |/| | | | | | | | | Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354
| * Send deployment_status when job starts environmentSteve Azzopardi2018-10-151-1/+1
| | | | | | | | | | | | | | | | | | The check was if the job `has_environment` which results into showing the environment information when the job stops the environment. This result into having a blank `deployment_status`. Use `starts_environment?` to be the same as the haml we have in 11.3 https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28
* | Add stage name in job.json responseSteve Azzopardi2018-10-121-0/+1
|/
* Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-052-0/+11
|
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-051-1/+1
|\
| * Merge branch 'security-osw-user-info-leak-discussions' into 'master'Bob Van Landuyt2018-10-051-1/+1
| |\ | | | | | | | | | | | | [security - master] Filter user sensitive data from discussions JSON See merge request gitlab/gitlabhq!2536
| | * Filter user sensitive data from discussions JSONOswaldo Ferreira2018-10-011-1/+1
| | |
* | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-051-8/+0
|\ \ \
| * \ \ Merge branch '50904-remove-icon-env' into 'master'Grzegorz Bizon2018-10-051-8/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | Removes icon key from job endpoint See merge request gitlab-org/gitlab-ce!22085
| | * | Removes icon key from job endpointFilipa Lacerda2018-10-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added because we thought we'd need to render the environment status but we already have this information in the build status
* | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-053-2/+31
|\ \ \ \ | |/ / /
| * | | Renders empty states in the Vue app in Job pageFilipa Lacerda2018-10-041-1/+7
| | | |
| * | | Merge branch '49329-mr-show-commit-details' into 'master'Fatih Acet2018-10-042-1/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add signature badge and pipeline status to commit details in MR diff Closes #49329 See merge request gitlab-org/gitlab-ce!22079
| | * | | Add pipeline status to diffs/commit_item49329-mr-show-commit-detailsPaul Slaughter2018-10-032-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | **Notes:** - Also exposes commit.pipeline_status_path in diffs.json
| | * | | Add signature badge to diffs/commit_itemPaul Slaughter2018-10-031-0/+10
| | |/ / | | | | | | | | | | | | | | | | **Notes:** - Also exposes commit.signature_html in diffs.json
* | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '_acet-fix-diff-file-header' into 'master'Mike Greiling2018-10-031-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Fix showing diff file header for renamed files Closes #48887 See merge request gitlab-org/gitlab-ce!22089
| | * | Fix showing diff file header for renamed filesFatih Acet2018-10-031-1/+1
| | | |
* | | | Add job_entity_specShinya Maeda2018-10-031-1/+9
| | | |
* | | | Add unschedule action to status buildShinya Maeda2018-10-021-1/+5
| | | |
* | | | Add scheduled_actions as an explicit group of actionsShinya Maeda2018-10-024-0/+4
|/ / /
* | | Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-011-1/+1
|\ \ \ | |/ / |/| |
| * | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
| |/
* | Add has_trace to Projects::JobController#show.jsonSteve Azzopardi2018-09-271-0/+1
|/ | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51925
* Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter2018-09-262-6/+18
|
* Expose runners status information in job apiSteve Azzopardi2018-09-181-0/+18
|
* Add runner JSON schemaSteve Azzopardi2018-09-171-2/+5
| | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51093
* Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński2018-09-171-0/+16
|\ | | | | | | | | | | | | Add retried jobs to pipeline stages Closes #50461 See merge request gitlab-org/gitlab-ce!21558
| * Add retried jobs to pipeline stagesSteve Azzopardi2018-09-131-0/+16
| | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50461
* | Add deployment information in job APISteve Azzopardi2018-09-131-0/+14
|/ | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50460
* Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-137-2/+14
|\ | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-117-2/+14
| | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | Add trigger information for job APISteve Azzopardi2018-09-122-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
* | Add empty state illustration information in job APISteve Azzopardi2018-09-115-5/+13
|/
* Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-081-0/+1
|
* Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-072-4/+10
|
* Add terminal path to job API responseSteve Azzopardi2018-09-061-0/+8
| | | | closes #51117
* Merge branch '50101-add-artifact-information-to-job-api' into 'master'Kamil Trzciński2018-09-041-0/+22
|\ | | | | | | | | Add artifact information in job API See merge request gitlab-org/gitlab-ce!21328
| * Add artifact information for job controllerSteve Azzopardi2018-09-031-0/+22
| | | | | | | | gitlab-org/gitlab-ce#50101
* | Use a serializer to render diff linesFelipe Artur2018-08-315-3/+28
|/
* Fixed project logo when it is LFS trackedFrancisco Javier López2018-08-301-1/+0
|
* Refactor AutocompleteControllerdefine-abstraction-levelsYorick Peterse2018-08-202-0/+11
| | | | | | | | | | | | | | | | | | | | | | | This refactors the AutocompleteController according to the guidelines and boundaries discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/49653. Specifically, ActiveRecord logic is moved to different finders, which are then used in the controller. View logic in turn is moved to presenters, instead of directly using ActiveRecord's "to_json" method. The finder MoveToProjectFinder is also adjusted according to the abstraction guidelines and boundaries, resulting in a much more simple finder. By using finders (and other abstractions) more actively, we can push a lot of logic out of the controller. We also remove the need for various "before_action" hooks, though this could be achieved without using finders as well. The various finders related to AutcompleteController have also been moved into a namespace. This removes the need for calling everything "AutocompleteSmurfFinder", instead you can use "Autocomplete::SmurfFinder".
View Lorry Controller Status