summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-152-4/+9
| | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276
* Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-081-0/+9
|\ | | | | | | | | | | | | Resolve "No Rendering of emoji's in Group-Overview after update" Closes #40549 See merge request gitlab-org/gitlab-ce!16098
| * Rendering of emoji's in Group-OverviewJacopo2017-12-241-0/+9
| | | | | | | | Allows rendering of emoji's in the Group Overview.
* | Merge branch '22643-manual-job-page' into 'master'Kamil Trzciński2018-01-061-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Improve non-triggered manual action job detail page" Closes #22643 and #37843 See merge request gitlab-org/gitlab-ce!15991
| * \ Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-043-7/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (200 commits) Fix issue boards scroll config. Added multi editor setting on the profile preferences page fix missing import of timeWeek which would cause errors in prometheus graphs with deployments Remove downcase from special path helper Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql} Fix error when viewing diffs without blobs Moves prettier to dev dependency Eager load event target authors whenever possible Do not run ee_compat_check on security branches Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Move git operations for UpdateRemoteMirrorService into Gitlab::Git Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Update Kubernetes service documentation fix issue #37843 ...
| * \ \ Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2017-12-221-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (68 commits) Last push event widget width for fixed layout Added 'admin' persona Docs: move article Artifactory + GL to subject-related folder Mention GitLab Pages when changing username Consolidate the docs when changing a repo path Add docs for automatic redirects when renaming namespaces move "Transfer an existing project into a group" to project docs Do not show Vue pagination if only one page Resolve "Decouple multi-file editor from file list" Update Ruby version to 2.3.6 Skip projects filter on merge requests search Fall back to the `MergeRequestWidgetEntity` LDAP extern_uids are not normalized when updated via API organise content by subject Restore missing language code in datetime_utility.js Add support for defining explicit dependencies to QA factories Document mounting volumes with Docker-in-Docker add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml Use seconds where possible, and convert to milliseconds for Influxdb consumption update dispatcher to allow for dynamic imports until webpack plugin is updated ...
| * | | Adds illustrations for manual actions and non triggered jobsFilipa Lacerda2017-12-191-0/+2
| | | |
* | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-052-0/+11
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | Simplify metrics fetching for closed/merged MRsosw-introduce-merge-request-statisticsOswaldo Ferreira2018-01-031-6/+5
| | |
* | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-7/+35
| |/ |/|
* | Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-1/+1
|/ | | | When no serializer was passed.
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-185-20/+13
|\ | | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-155-20/+13
| | | | | | | | requests
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| * Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-1/+1
| |
* | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-181-1/+1
|/
* Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-141-1/+1
|\ | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
| * Do not allow jobs to be erasedShinya Maeda2017-11-061-1/+1
| |
* | Clean up schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-091-1/+0
| | | | | | | | | | | | | | | | This adds various foreign key constraints, indexes, missing NOT NULL constraints, and changes some column types from timestamp to timestamptz. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31811
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-083-8/+4
|\ \
| * | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-063-8/+4
| |/ | | | | | | Closes #38360
* | Add ClusterApplicationEntity testsAlessio Caiazza2017-11-062-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-034-8/+19
|\ \ | |/
| * CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-024-8/+19
| |
* | Improve backend structure of dataKamil Trzcinski2017-11-022-12/+6
| |
* | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-0214-46/+206
|\ \ | |/
| * Load participants asyncEric Eastwood2017-10-315-7/+42
| |
| * Added submodule support in multi-file editorPhil Hughes2017-10-201-1/+1
| |
| * Fix inability to delete container registry tagsStan Hu2017-10-181-1/+1
| | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
| * Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
| | * Add short_revision and use total_sizeKamil Trzcinski2017-10-171-1/+1
| | |
| * | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-131-1/+3
| | | | | | | | | | | | Even when we pass an array of only a single object
| * | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-16/+12
| | |
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-107-5/+24
| |\ \ | | |/
| * | Don't preload all memberships for a userBob Van Landuyt2017-10-101-1/+1
| | |
| * | Return `self` from `GroupChildSerializer#expand_hierarchy`Bob Van Landuyt2017-10-101-5/+5
| | |
| * | Use `expose` with blocks instead of defining methodsBob Van Landuyt2017-10-051-27/+26
| | |
| * | Rename parameters to paramsBob Van Landuyt2017-10-052-5/+5
| | |
| * | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-5/+11
| | |
| * | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-32/+2
| | |
| * | Fix nesting bug when rendering children of a shared subgroupBob Van Landuyt2017-10-041-1/+1
| | |
| * | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-041-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | By preloading the count of members, projects and subgroups of a group, we don't need to query them later. We also preload the entire hierarchy for a search result and include the counts so we don't need to query for them again
| * | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-1/+1
| | |
| * | Don't wrap arrays twice: `children` are already wrapped in an arrayBob Van Landuyt2017-10-041-2/+2
| | | | | | | | | | | | We do the wrapping in an array in represent_hierarchy for children.
| * | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-042-4/+4
| | |
| * | `current_user:` as a keyword argumentBob Van Landuyt2017-10-041-1/+2
| | |
| * | Include pagination when rendering expanded hierarchiesBob Van Landuyt2017-10-042-17/+21
| | |
| * | Replace `full_path`, `path` & `web_url` with a single `relative_path`Bob Van Landuyt2017-10-041-1/+9
| | |
| * | Use same response-body in groups-dashboard as we do for group-homeBob Van Landuyt2017-10-041-2/+3
| | |
| * | Include `can_leave` for a groupBob Van Landuyt2017-10-041-1/+9
| | |
View Lorry Controller Status