summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove nils from project_statistics.packages_sizeac-namespaces-stats-no-coalesceAlessio Caiazza2019-05-305-2/+66
| | | | Now it defaults to 0
* Merge branch 'sh-remove-chrome-apt-dependency-ci' into 'master'Lin Jen-Shin2019-05-301-0/+1
|\ | | | | | | | | Remove Google apt source from gitlab:assets:compile step See merge request gitlab-org/gitlab-ce!28905
| * Remove Google apt source from gitlab:assets:compile stepStan Hu2019-05-301-0/+1
|/ | | | | Chrome is already installed in this image, and the apt-get update is only used to install jq.
* Merge branch 'winh-issue-boards-clearDetailIssue' into 'master'Phil Hughes2019-05-304-2/+16
|\ | | | | | | | | Extract clearDetailIssue() to issue boards store See merge request gitlab-org/gitlab-ce!28825
| * Extract clearDetailIssue() to issue boards storeWinnie Hellmann2019-05-304-2/+16
|/
* Merge branch '61788-predefined-colours-dont-have-descriptive-labels' into ↵Jan Provaznik2019-05-306-36/+104
|\ | | | | | | | | | | | | | | | | 'master' Fix for #61788 predefined colours dont have descriptive labels Closes #61788 See merge request gitlab-org/gitlab-ce!28343
| * Fix for #61788 predefined colours dont have descriptive labelsChris Toynbee2019-05-306-36/+104
| |
* | Merge branch 'docs/ssot-diff-limits' into 'master'Achilleas Pipinellis2019-05-301-11/+30
|\ \ | | | | | | | | | | | | Update diff_limits.md See merge request gitlab-org/gitlab-ce!28459
| * | Update diff_limits.mdRussell Dickenson2019-05-301-11/+30
|/ /
* | Merge branch 'docs-omnibus-grafana' into 'master'Achilleas Pipinellis2019-05-301-3/+5
|\ \ | | | | | | | | | | | | list omnibus grafana installation details See merge request gitlab-org/gitlab-ce!28269
| * | list omnibus grafana installation detailsdocs-omnibus-grafanaBen Bodenmiller2019-05-111-3/+5
| | |
* | | Merge branch 'docs-ssot-ci-2' into 'master'Achilleas Pipinellis2019-05-308-6/+35
|\ \ \ | | | | | | | | | | | | | | | | Docs: ssot ci/*/files See merge request gitlab-org/gitlab-ce!28802
| * | | Add doc typeMarcia Ramos2019-05-308-6/+35
|/ / / | | | | | | | | | For ssot epic
* | | Merge branch 'docs-ssot-ci-1' into 'master'Achilleas Pipinellis2019-05-306-0/+24
|\ \ \ | | | | | | | | | | | | | | | | Docs: ssot ci/files See merge request gitlab-org/gitlab-ce!28801
| * | | Add doc typedocs-ssot-ci-1Marcia Ramos2019-05-276-0/+24
| | | | | | | | | | | | | | | | For ssot epic
* | | | Merge branch 'docs-its-relative-1' into 'master'Achilleas Pipinellis2019-05-304-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Change links to relative in /topics docs See merge request gitlab-org/gitlab-ce!28912
| * | | | Docs: Change links to relative in /topics docsMarcel Amirault2019-05-304-20/+20
|/ / / /
* | | | Merge branch 'docs-ssot-ci-services' into 'master'Achilleas Pipinellis2019-05-304-4/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: ssot - ci services See merge request gitlab-org/gitlab-ce!28800
| * | | | Add doc typeMarcia Ramos2019-05-304-4/+21
|/ / / / | | | | | | | | | | | | For CI services examples
* | | | Merge branch 'tpresa-fix-highest-role-docs' into 'master'Achilleas Pipinellis2019-05-301-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix highest role docs See merge request gitlab-org/gitlab-ce!28892
| * | | | Fix highest role docsThiago Presa2019-05-301-3/+3
|/ / / / | | | | | | | | | | | | | | | | The docs for the highest_role field was incorrectly added to the /users endpoint. This commit adds it to the /users/:id
* | | | Merge branch 'jl-update-components-k8s-apps-docs' into 'master'Achilleas Pipinellis2019-05-301-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename Kubernetes Cluster Apps to GitLab Managed Apps See merge request gitlab-org/gitlab-ce!28894
| * | | | Rename Kubernetes Cluster Apps to GitLab Managed Appsjl-update-components-k8s-apps-docsJoshua Lambert2019-05-291-2/+2
| | | | |
* | | | | Merge branch 'qa-reload-to-check-branches-deleted' into 'master'Ramya Authappan2019-05-302-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [QA] Reload page to check if branch is deleted See merge request gitlab-org/gitlab-ce!28583
| * | | | | Reload page to check if branch is deletedqa-reload-to-check-branches-deletedMark Lapierre2019-05-242-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the "Delete merged branches" button is used the UI doesn't update automatically. So when the page is refreshed it's possible that the branch will still be present. This checks for the branch to be gone and reloads if it is not, repeating until the default timeout (60s).
* | | | | | Merge branch 'docs-hackathon-5' into 'master'Evan Read2019-05-304-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix 4 docs to resolve follow-up issue Closes #61994 See merge request gitlab-org/gitlab-ce!28910
| * | | | | | Docs: Fix 4 docs to resolve follow-up issueMarcel Amirault2019-05-304-2/+4
|/ / / / / /
* | | | | | Merge branch 'docs/third-iteration-on-writing-end-to-end-tests-doc' into ↵Mark Lapierre2019-05-302-162/+262
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Third iteration on writing end to end tests doc Closes #62158 See merge request gitlab-org/gitlab-ce!28716
| * | | | | | Lots of adjustments in the writing tests docWalmyr2019-05-302-162/+262
|/ / / / / /
* | | | | | Merge branch 'qa-public-class-methods' into 'master'Mark Lapierre2019-05-301-32/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move public class methods out of private See merge request gitlab-org/gitlab-ce!28768
| * | | | | | Move public class methods out of privateqa-public-class-methodsThong Kuah2019-05-271-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private modifier by itself does nothing for class methods (need `private_class_method` for that). As these are documented to be public methods in README, move them to the top.
* | | | | | | Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'Mark Lapierre2019-05-303-16/+43
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fabricate a file via the API Closes gitlab-org/quality/nightly#42 See merge request gitlab-org/gitlab-ce!28770
| * | | | | | Add file via browser when testing the UIMark Lapierre2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that it's possible to add a file via the API we need to make sure the UI test uses the browser UI fabrication, not the API.
| * | | | | | Fabricate a file via the APIMark Lapierre2019-05-272-15/+42
| |/ / / / /
* | | | | | Merge branch 'docs/api-single-codebase-clean-port' into 'master'Evan Read2019-05-295-3/+677
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port some EE API docs to CE See merge request gitlab-org/gitlab-ce!28453
| * | | | | | Port some EE API docs to CEAchilleas Pipinellis2019-05-295-3/+677
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following EE files had small differences with their CE counterpart so they have been ported to CE: - doc/api/boards.md - doc/api/discussions.md - doc/api/notes.md - doc/api/resource_label_events.md - doc/api/services.md
* | | | | | Merge branch 'docs-masked-variables-requirements' into 'master'Evan Read2019-05-291-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clarify allowed characters in masked variables See merge request gitlab-org/gitlab-ce!28864
| * | | | | | Docs: Clarify allowed characters in masked variablesKrasimir Angelov2019-05-291-3/+2
|/ / / / / /
* | | | | | Merge branch 'ee-10587-geo-development-fdw-docs' into 'master'Evan Read2019-05-291-6/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added FDW development documentation Closes gitlab-ee#10587 See merge request gitlab-org/gitlab-ce!28501
| * | | | | | Added FDW development documentationee-10587-geo-development-fdw-docsGabriel Mazetto2019-05-291-6/+72
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve existing FDW documentation in `doc/development` to include additional information about the architecture and how to use FDW as a developer.
* | | | | | Merge branch '61024-update-resolved-icon' into 'master'Clement Ho2019-05-294-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new icon if resolved Closes #61024 See merge request gitlab-org/gitlab-ce!28663
| * | | | | | Add new icon if resolved61024-update-resolved-iconJarek Ostrowski2019-05-294-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted change Add changelog Add check circle filled count widget Change color for consistency Remove resolve button class Merge master Change to single icon, conditional name Remove authorship Remove unnecessary added styles
* | | | | | | Merge branch 'add-wiki-size-to-statistics' into 'master'Stan Hu2019-05-2923-28/+238
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wiki size to project statistics Closes #57822 See merge request gitlab-org/gitlab-ce!25321
| * | | | | | | Add spec to verify statistics without repositoriesPeter Marko2019-05-291-0/+38
| | | | | | | |
| * | | | | | | Add wiki size to project statisticsPeter Marko2019-05-2923-28/+200
| | | | | | | |
* | | | | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-05-293-7/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.10.1 See merge request gitlab-org/gitlab-ce!28862
| * | | | | | | | Update Snapshots for MR PopoversAndrew Fontaine2019-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new attribute was added to `GlPopover`, so the snapshots had to be updated to match.
| * | | | | | | | Update dependency @gitlab/ui to ^3.10.1Lukas 'Eipi' Eipert2019-05-292-7/+7
| | | | | | | | |
* | | | | | | | | Merge branch '61646-vrt-webpack' into 'master'Mike Greiling2019-05-297-305/+269
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve visual review toolbar script with Webpack Closes #61646 See merge request gitlab-org/gitlab-ce!28736
| * | | | | | | | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-297-305/+269
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | It takes a lot of lines to move a script