summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update some Gitaly annotations in Gitlab::Shellgitaly-annotations-20180104Jacob Vosmaer2018-01-041-9/+4
|
* Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-0417-157/+334
|\ | | | | | | | | | | | | Groups tree enhancements Closes #40533 See merge request gitlab-org/gitlab-ce!15980
| * Make tooltip placement bottom by default as per design guidelines40533-groups-tree-updatesKushal Pandya2018-01-043-2/+4
| |
| * Fix groups list icon, timestamp alignment and row heightKushal Pandya2018-01-041-3/+24
| |
| * Update test to remove carent icon checkKushal Pandya2018-01-021-8/+0
| |
| * Update styles to fix SVG caret alignmentKushal Pandya2017-12-281-1/+7
| |
| * Update selector to test SVG icon nameKushal Pandya2017-12-281-7/+3
| |
| * Use SVG sprite iconsKushal Pandya2017-12-281-5/+10
| |
| * Use ItemStatValue component for project star countKushal Pandya2017-12-261-5/+5
| |
| * Make `title` optionalKushal Pandya2017-12-261-1/+2
| |
| * Add changelog entryKushal Pandya2017-12-261-0/+6
| |
| * Update selector to test SVG icon name, cleanup testsKushal Pandya2017-12-262-45/+18
| |
| * Update icon names, add `updated_at` prop to mock objectsKushal Pandya2017-12-261-3/+19
| |
| * Update styles to show `updatedAt`Kushal Pandya2017-12-261-9/+34
| |
| * Use ItemStatsValue Component, add `updatedAt` info for projectsKushal Pandya2017-12-261-51/+37
| |
| * ItemStatsValue ComponentKushal Pandya2017-12-262-0/+148
| |
| * Update avatar size to be 24pxKushal Pandya2017-12-261-3/+5
| |
| * Update icon name to use from SVG spriteKushal Pandya2017-12-261-3/+3
| |
| * Use SVG sprite iconsKushal Pandya2017-12-262-17/+14
| |
| * Add `updatedAt` prop for ProjectsKushal Pandya2017-12-261-0/+1
| |
| * Reduce font size for 24px identiconKushal Pandya2017-12-261-1/+1
| |
* | Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-043-10/+25
|\ \ | | | | | | | | | | | | Avoid leaving a push event empty if payload cannot be created See merge request gitlab-org/gitlab-ce!16214
| * | Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-033-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
* | | Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern2018-01-042-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Handle Gitaly aborted merge due to branch update Closes gitaly#854 See merge request gitlab-org/gitlab-ce!16116
| * | | Better Englishgitaly-merge-nilJacob Vosmaer2018-01-031-1/+1
| | | |
| * | | Fix method lookupJacob Vosmaer2018-01-031-1/+3
| | | |
| * | | Handle Gitaly aborted merge due to branch updateJacob Vosmaer2018-01-032-0/+15
| | | |
* | | | Merge branch 'integration-tests' into 'master'Rémy Coutable2018-01-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Include integration tests in CE/EE testing documentation See merge request gitlab-org/gitlab-ce!16139
| * | | | Include integration tests in CE/EE testing documentationJoshua Lambert2018-01-041-1/+1
| | | | |
* | | | | Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable2018-01-043-3/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add support for max_count option to Git::Repository#count_commits See merge request gitlab-org/gitlab-ce!16145
| * | | | Add support for max_count option to Git::Repository#count_commitsfeature/add-max-count-to-count-commits-rpcAhmad Sherif2017-12-276-7/+17
| | | | |
* | | | | Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern2018-01-048-12/+402
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083
| * | | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migrationYorick Peterse2018-01-038-12/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt (rolled back in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried to migrate `issues.closed_at` from timestamp to timestamptz using a regular migration. This has a bad impact on GitLab.com and as such was rolled back. This commit re-implements the original migrations using generic background migrations, allowing us to still migrate the data in a single release but without a negative impact on availability. To ensure the database schema is up to date the background migrations are performed inline in development and test environments. We also make sure to not migrate that that doesn't need migrating in the first place or has already been migrated.
* | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0442-98/+805
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | | | | | Simplify metrics fetching for closed/merged MRsosw-introduce-merge-request-statisticsOswaldo Ferreira2018-01-031-6/+5
| | | | | | |
| * | | | | | Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-023-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | closed/merged
| * | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-0242-98/+799
| | | | | | |
* | | | | | | Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into ↵Kamil Trzciński2018-01-0418-14/+244
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 41054-Disallow creation of new Kubernetes integrations Closes #41054 See merge request gitlab-org/gitlab-ce!16017
| * | | | | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-0418-14/+244
| | | | | | | |
* | | | | | | | Merge branch '40042-resizable-file-list-and-commit-panel' into 'master'Filipa Lacerda2018-01-0410-5/+262
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resizable file list and commit panel" Closes #40042 See merge request gitlab-org/gitlab-ce!16178
| * | | | | | | Resolve "Resizable file list and commit panel"Tim Zallmann2018-01-0410-5/+262
|/ / / / / / /
* | | | | | | Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon2018-01-042-34/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use heredoc for long strings so it's easier to read See merge request gitlab-org/gitlab-ce!16179
| * | | | | | | Use heredoc for long strings so it's easier to readuse-heredoc-for-keysLin Jen-Shin2018-01-032-34/+43
| | | | | | | |
* | | | | | | | Merge branch ↵Grzegorz Bizon2018-01-043-5/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * | | | | | | | Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-033-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | | | | | | | | Merge branch ↵Kamil Trzciński2018-01-033-1/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature' into 'master' fix issue #37843 Closes #37843 See merge request gitlab-org/gitlab-ce!15902
| * | | | | | | | | fix issue #37843Danny2018-01-033-1/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-032-0/+60
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042
| * | | | | | | | | Set Auto Browser Performance Testing to 10.4update-autodevops-templateJoshua Lambert2017-12-211-1/+1
| | | | | | | | | |
| * | | | | | | | | Add docs for AutoDevOpsJoshua Lambert2017-12-211-0/+15
| | | | | | | | | |
View Lorry Controller Status