summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrytranspile-bootstrap-vueEnrique Alcantara2019-04-261-0/+5
|
* Update gitlab-ui to fix IE11 bugEnrique Alcantara2019-04-262-5/+4
|
* Merge branch 'issue-42692-deployment-chat-notifications' into 'master'Douglas Barbosa Alexandre2019-04-2627-5/+451
|\ | | | | | | | | Deployment Chat Notifications See merge request gitlab-org/gitlab-ce!27338
| * Add deployment events to chat notification servicesJason Goodman2019-04-2627-5/+451
|/ | | | | This enables sending a chat message to Slack or Mattermost upon a successful, failed, or canceled deployment
* Merge branch 'docs-rollout-resource-type' into 'master'Mike Lewis2019-04-261-0/+1
|\ | | | | | | | | Add rollout type to variables list. See merge request gitlab-org/gitlab-ce!27757
| * Add rollout type to variables list.danielgruesso2019-04-261-0/+1
| |
* | Merge branch 'winh-boards-drag-selection' into 'master'Annabel Dunstone Gray2019-04-264-1/+12
|\ \ | | | | | | | | | | | | | | | | | | Prevent text selection when dragging in issue boards Closes #59378 See merge request gitlab-org/gitlab-ce!27724
| * | Add vendor prefixes for user-selectWinnie Hellmann2019-04-264-1/+12
| | |
* | | Merge branch 'docs/dashboard' into 'master'Marcia Ramos2019-04-261-1/+21
|\ \ \ | | | | | | | | | | | | | | | | Documented the Admin Area's `Dashboard` See merge request gitlab-org/gitlab-ce!27445
| * | | Documented the Admin Area's `Dashboard`Russell Dickenson2019-04-261-1/+21
|/ / / | | | | | | | | | Part of issue 57874
* | | Merge branch 'update-gitlab-runner-helm-chart-to-0-4-1' into 'master'Robert Speicher2019-04-262-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.4.1/11.10.1 See merge request gitlab-org/gitlab-ce!27627
| * | | Update GitLab Runner Helm Chart to 0.4.1/11.10.1Steve Azzopardi2019-04-262-1/+6
| | | |
* | | | Merge branch 'docs/add-group-name-restricted-chars' into 'master'Marcia Ramos2019-04-261-8/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List group name restrictions Closes #60341 See merge request gitlab-org/gitlab-ce!27609
| * | | | List group name restrictionsEvan Read2019-04-261-8/+15
|/ / / /
* | | | Merge branch 'pl-fix-upload-image-screenshots' into 'master'Clement Ho2019-04-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CI: Fix upload of screenshots in gitlab:ui:visual See merge request gitlab-org/gitlab-ce!27758
| * | | | CI: Fix upload of screenshots in gitlab:ui:visualPeter Leitzen2019-04-261-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit uploading of screenshots failed with WARNING: tests/__image_snapshots__/: no matching files ERROR: No files to upload ERROR: Job failed: exit code 1 After this commit it works again Uploading artifacts... gitlab-ui/tests/__image_snapshots__/: found 90 matching files Uploading artifacts to coordinator... ok
* | | | Merge branch 'sh-update-rugged-backport-docs' into 'master'Marcia Ramos2019-04-261-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update NFS docs to reflect new Rugged backports See merge request gitlab-org/gitlab-ce!27632
| * | | | Update NFS docs to reflect new Rugged backportsStan Hu2019-04-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We backported the Rugged implementations of a Git access to older versions of GitLab. Update the documentation to reflect this. Relates to: * https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/21833/diffs * https://gitlab.com/gitlab-org/release/tasks/issues/749
* | | | | Merge branch '57171-add-dashboard-settings' into 'master'Douglas Barbosa Alexandre2019-04-2616-4/+188
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add ProjectMetricsDashboardSetting model and table See merge request gitlab-org/gitlab-ce!27550
| * | | | Add ProjectMetricsDashboardSetting model and tableReuben Pereira2019-04-2616-4/+188
|/ / / / | | | | | | | | | | | | | | | | | | | | This new table will be used to store the external_dashboard_url which allows users to add a link to their external dashboards (ex Grafana) to the Metrics dashboard.
* | | | Merge branch '3713-cross-project-environments-dashboard-mvc-backport' into ↵Filipa Lacerda2019-04-261-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport Environments Dashboard SCSS Changes See merge request gitlab-org/gitlab-ce!27498
| * | | | Backport Environments Dashboard SCSS Changes3713-cross-project-environments-dashboard-mvc-backportAndrew Fontaine2019-04-241-5/+3
| | | | |
* | | | | Merge branch 'winh-move-static-fixtures' into 'master'Clement Ho2019-04-268-9/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Move all static fixtures to static directory See merge request gitlab-org/gitlab-ce!27668
| * | | | Move all static fixtures to static directoryWinnie Hellmann2019-04-258-9/+9
| | |_|/ | |/| |
* | | | Merge branch '7182-add-dast-full-scan-enabled-support-ce' into 'master'Achilleas Pipinellis2019-04-261-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add ZAP Full Scan support to DAST vendored template See merge request gitlab-org/gitlab-ce!27513
| * | | | Add ZAP Full Scan support to DAST vendored templateVictor Zagorodny2019-04-261-1/+3
|/ / / /
* | | | Merge branch '#57351-add-dotnet-core-yaml-template' into 'master'Grzegorz Bizon2019-04-262-0/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #57351 - Add .NET Core YAML template Closes #57351 See merge request gitlab-org/gitlab-ce!25604
| * | | | Add changelog for MR !25604Piotr Wosiek2019-04-261-0/+5
| | | | | | | | | | | | | | | | | | | | Add changelog for adding .NET Core YAML template
| * | | | Update .NET Core YAML templatePiotr Wosiek2019-04-261-11/+10
| | | | | | | | | | | | | | | | | | | | Improve indent for cache paths
| * | | | Update .NET Core YAML template - improve indentPiotr Wosiek2019-04-251-47/+38
| | | | | | | | | | | | | | | | | | | | Improve indent and remove empty lines
| * | | | Update .NET Core YAML template - improve cachingPiotr Wosiek2019-03-221-27/+22
| | | | | | | | | | | | | | | | | | | | Revise logic of dependency caching, add cache key, make before script global.
| * | | | Update .NET Core YAML template - add cachePiotr Wosiek2019-03-201-22/+77
| | | | | | | | | | | | | | | | | | | | Update the template showing how to cache restored dependencies, add few variables, reduce before_script part, add and improve descriptions.
| * | | | Make the testing section more genericPiotr Wosiek2019-03-131-6/+8
| | | | |
| * | | | Remove the diagram of project directories structurePiotr Wosiek2019-03-131-10/+0
| | | | |
| * | | | Improve note about building not .NET Core based projectsPiotr Wosiek2019-03-131-5/+5
| | | | |
| * | | | Add .NET Core YAML templatePiotr Wosiek2019-02-271-0/+75
| | | | |
* | | | | Merge branch 'docs-fix-ref-links-ci-variables' into 'master'Achilleas Pipinellis2019-04-261-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix reference-style links in CI predefined vars See merge request gitlab-org/gitlab-ce!27584
| * | | | | Fix reference-style links in CI predefined varsPeter Leitzen2019-04-261-0/+4
|/ / / / /
* | | | | Merge branch 'qa-nightly-97-quarantin-add-file-template-spec' into 'master'Sanad Liaquat2019-04-261-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Quarantine flaky tests See merge request gitlab-org/gitlab-ce!27732
| * | | | Quaraintine flaky testsSanad Liaquat2019-04-261-1/+2
| | | | |
* | | | | Merge branch '57171-operations-controller-spec-refactor' into 'master'Grzegorz Bizon2019-04-261-106/+110
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Refactor operations controller spec Closes #57171 See merge request gitlab-org/gitlab-ce!27558
| * | | | Fix a bug in shared_examples definition57171-operations-controller-spec-refactorrpereira22019-04-251-1/+1
| | | | |
| * | | | Move shared context to top of spec filerpereira22019-04-241-60/+52
| | | | | | | | | | | | | | | | | | | | | | | | | - Rename the shared_context - Use expect in stub_operations_update_service_returning.
| * | | | Refactor operations controller specrpereira22019-04-221-105/+117
| | | | | | | | | | | | | | | | | | | | | | | | | - Move specs into a shared_context so that they can be reused. - Move common specs out of a more specific context.
* | | | | Merge branch 'winh-stylelint-valid-json' into 'master'Phil Hughes2019-04-261-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make stylelint config a valid JSON file See merge request gitlab-org/gitlab-ce!27721
| * | | | | Make stylelint config a valid JSON fileWinnie Hellmann2019-04-261-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'revert-55767af4' into 'master'Filipa Lacerda2019-04-263-15/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into 'master'" See merge request gitlab-org/gitlab-ce!27727
| * | | | | Revert "Merge branch '60855-mr-popover-is-not-attached-in-system-notes' into ↵Phil Hughes2019-04-263-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !27589
* | | | | | Merge branch 'use-constant-for-helm-runner-check' into 'master'Grzegorz Bizon2019-04-261-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Use constants for asserstion for helm chart test See merge request gitlab-org/gitlab-ce!27629
| * | | | | Use constants for assertion for helm chart testSteve Azzopardi2019-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are duplicating the value from the constant `Clusters::Applications::Runner::VERSION` inside of the tests which results into developers having to update the tests as well when they want to upgrade the Helm chart used for GitLab Runner