summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Changes tab VUE refactoringFelipe Artur2018-06-219-27/+327
|
* Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-151-0/+4
|
* Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-10/+1
|\ | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * create favicon overlay on the clientAlexis Reigel2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront.
| * call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | this ways we can keep the `lib/gitlab/ci/status/*` classes to return the bare favicon name as it was before. also the favicon uploader versions are now have the same names as the stock favicons (+ `favicon_` prefix), which makes working with the status names easier.
| * use custom favicon for ci build status faviconsAlexis Reigel2018-06-051-10/+1
| |
* | Merge branch 'master' into ↵Kamil Trzciński2018-06-051-1/+1
|\ \ | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| * \ Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-1/+1
| |\ \ | | |/ | |/| | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | * Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
| | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
* | | Merge branch 'master' into ↵backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-054-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' Conflicts: app/models/ci/pipeline.rb
| * | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into ↵Dmitriy Zaporozhets2018-06-011-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 'master' Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019
| | * Merge remote-tracking branch 'origin/master' into ↵Dmitriy Zaporozhets2018-05-301-1/+1
| | |\ | | | | | | | | | | | | 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
| | * \ Merge remote-tracking branch 'origin/master' into ↵Dmitriy Zaporozhets2018-05-301-0/+1
| | |\ \ | | | | | | | | | | | | | | | 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
| | * | | Add support for Jupyter in GitLab via KubernetesDmitriy Zaporozhets2018-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch '46552-fixes-redundant-message-for-failure-reasons' into 'master'Grzegorz Bizon2018-05-311-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes redudant script failure message Closes #46552 and #44271 See merge request gitlab-org/gitlab-ce!19138
| | * | | Moves script_failure conditional over lambda46552-fixes-redundant-message-for-failure-reasonsMayra Cabrera2018-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | So the 'failed' message can actually indicate if the build failed or not
| | * | | Removes redundant error message for script failuresMayra Cabrera2018-05-241-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Script failure message was redundant so it was removed. Also 'check your job log' message was removed from all the error messages. Closes #44271
| * | | Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-301-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Add `shared_projects` endpoint Closes #46800 See merge request gitlab-org/gitlab-ce!19141
| | * | Add archived param to the json responsebvl-group-shared-projects-private-apiToon Claes2018-05-301-1/+1
| | |/
| * | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+1
| |/
* | Add a feature flag for switching pipeline stagesGrzegorz Bizon2018-05-291-1/+1
| |
* | Fix pipelines serializer with preloading paginationGrzegorz Bizon2018-05-251-4/+4
| |
* | Reduce pipeline serialization queries when preloadedGrzegorz Bizon2018-05-241-3/+5
| |
* | Do not paginate pipelines active relation twiceGrzegorz Bizon2018-05-231-7/+6
| |
* | Abstract persisted/legacy stages in pipeline modelGrzegorz Bizon2018-05-221-6/+1
| |
* | Use persisted stages to load pipelines index tableGrzegorz Bizon2018-05-211-1/+6
|/
* Exclude coverage data from the pipelines pageYorick Peterse2018-05-171-1/+5
| | | | | | | | When displaying a project's pipelines (Projects::PipelinesController#index) we now exclude the coverage data. This data was not used by the frontend, yet getting it would require one SQL query per pipeline. These queries in turn could be quite expensive on GitLab.com.
* Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-071-0/+7
|\ | | | | | | | | | | | | Resolve "Display merge commit SHA in merge widget after merge" Closes #43557 See merge request gitlab-org/gitlab-ce!18722
| * Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+7
| |
* | Adds remote mirror table migrationTiago Botelho2018-05-071-2/+0
| |
* | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-071-0/+13
| |
* | Fix stage.json endpointKamil Trzciński2018-04-233-22/+17
| |
* | Add proper stage.json dataKamil Trzciński2018-04-232-0/+28
|/
* Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-191-0/+27
|
* Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera2018-04-191-0/+18
|
* Prevent awarding emoji when a project is archivedBob Van Landuyt2018-04-112-0/+8
| | | | This prevents performing the requests, and disables all emoji reaction buttons
* Remove edit_note and update_note abilities in favor of admin_noteDouwe Maan2018-04-101-1/+1
|
* Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-051-1/+1
|
* Fix sidebar_details_block.vue and simplify build_metadata_entity.rb44922-fix-build-metadata-creationTomasz Maczukin2018-04-041-4/+1
|
* Refactor discussions/notes codeJan Provaznik2018-04-035-35/+32
|
* Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-292-0/+11
|\ | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * Refactor build_metadataTomasz Maczukin2018-03-281-3/+1
| |
| * Rename metadata relation and methodsTomasz Maczukin2018-03-281-1/+3
| |
| * Rename used_timeout to timeoutTomasz Maczukin2018-03-281-2/+2
| |
| * Fix static analysis offencesTomasz Maczukin2018-03-281-1/+0
| |
| * Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-282-4/+11
| |
| * Change timeout_source to enumTomasz Maczukin2018-03-281-1/+1
| |
| * Replace user_readable with human_readableTomasz Maczukin2018-03-281-1/+1
| |
| * Show timeout information on job's pageTomasz Maczukin2018-03-281-0/+5
| |
* | Update styling and use Gitlab::Utils.to_booleanEric Eastwood2018-03-271-7/+8
| |