summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ReviewApps: CI pin external-dns to 2.x version64356-pin-external-dns-versionJason Plum2019-07-121-3/+4
| | | | | | | | | | | | | Pin the version of deployed external-dns to `2.y.z`, using SemVer matching. (`^2.2.1`) Update the properties for the service account keys per *Upgrading to 2.0.0* of the `stable/external-dns` README. Add `aws.batchChangeSize=400` to combat messages about RDATA being too large. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64356
* Merge branch '62363-follow-up-from-move-more-project-routes-under-scope' ↵Lin Jen-Shin2019-07-101-0/+6
|\ | | | | | | | | | | | | | | | | into 'master' Add controller spec for deploy tokens Closes #62363 See merge request gitlab-org/gitlab-ce!30311
| * Add routing spec for deploy_tokens controllerDmitriy Zaporozhets2019-07-101-0/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch '63044-cluster-health-group-refactor' into 'master'Douglas Barbosa Alexandre2019-07-1016-208/+235
|\ | | | | | | | | | | | | Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
| * Remove unnecessary let in spec63044-cluster-health-group-refactorRyan Cobb2019-07-091-6/+3
| |
| * Remove unnecessary rubocop disableRyan Cobb2019-07-091-2/+0
| |
| * Rename Gitlab::Importers moduleRyan Cobb2019-07-0913-15/+15
| | | | | | | | | | In order to avoid confusion between Gitlab::Importers module and other like named modules, this renamed it to Gitlab::DatabaseImporters.
| * Remove prepending of EE moduleRyan Cobb2019-07-091-2/+0
| |
| * Remove CommonMetricsImporter patchRyan Cobb2019-07-0912-53/+34
| | | | | | | | | | | | Remove CommonMetricsImporter patch and change all references to CommonMetrics::Importer. Move specs into their appropriate folders. Also cleans up some common_metric importer namespacing.
| * Fully namespace importer dependenciesRyan Cobb2019-07-091-5/+5
| |
| * Remove prepending of EE moduleRyan Cobb2019-07-091-2/+0
| |
| * Move importers to lib folderRyan Cobb2019-07-0910-142/+153
| | | | | | | | | | This moves our metric importers into the lib folder. This will allow them to be autoloaded instead of having to explicitly require them.
| * Refactor common metrics importerRyan Cobb2019-07-098-172/+216
| | | | | | | | | | | | | | This refactors common metrics importer for two reasons. 1. To create a new pattern that can be followed by future importers that will minimize dependency collision and 2. To allow EE to more easily extend dependencies.
* | Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'Douglas Barbosa Alexandre2019-07-1030-95/+134
|\ \ | | | | | | | | | | | | Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
| * | Add newline before subjectprepare-cycle-analytics-for-group-levelMałgorzata Ksionek2019-07-107-1/+6
| | | | | | | | | | | | Fix rubocop offences
| * | Add attribute reader to project levelMałgorzata Ksionek2019-07-101-4/+7
| | |
| * | Add attribute readerMałgorzata Ksionek2019-07-1012-22/+24
| | |
| * | Add guard clauseMałgorzata Ksionek2019-07-091-0/+2
| | |
| * | Add cr remarksMałgorzata Ksionek2019-07-0912-12/+12
| | |
| * | Add code review remarksMałgorzata Ksionek2019-07-094-14/+8
| | |
| * | Update events specMałgorzata Ksionek2019-07-091-1/+1
| | |
| * | Add one method to base event fetcherMałgorzata Ksionek2019-07-092-0/+5
| | | | | | | | | | | | FIx file
| * | Fix rubocop offencesMałgorzata Ksionek2019-07-092-2/+2
| | |
| * | Add changelog entryMałgorzata Ksionek2019-07-091-0/+5
| | |
| * | Update controllers method callsMałgorzata Ksionek2019-07-092-2/+2
| | |
| * | Move project level specsMałgorzata Ksionek2019-07-091-2/+2
| | |
| * | Update class callsMałgorzata Ksionek2019-07-098-9/+8
| | |
| * | Modify base class for cycle analytics fetchingMałgorzata Ksionek2019-07-093-17/+34
| | |
| * | Change constant pathMałgorzata Ksionek2019-07-092-2/+2
| | |
| * | Move cycle analytics model to separate namespaceMałgorzata Ksionek2019-07-093-46/+53
| | |
* | | Merge branch ↵Annabel Dunstone Gray2019-07-102-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64331-Assignee-field-in-a-new-issue-has-an-incorrect-line-wrap' into 'master' Added css class to fix incorrect line wrap Closes #64331 See merge request gitlab-org/gitlab-ce!30523
| * | | Added css class to fix line wrap for assignee label in issuesMarc Schwede2019-07-102-1/+6
|/ / / | | | | | | | | | Fixes #64331
* | | Merge branch 'gitaly-version-v1.52.0' into 'master'Kamil Trzciński2019-07-102-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.52.0 See merge request gitlab-org/gitlab-ce!30568
| * | | Upgrade Gitaly to v1.52.0GitalyBot2019-07-102-1/+6
|/ / /
* | | Merge branch 'mf-modal-style-border-radius' into 'master'Annabel Dunstone Gray2019-07-102-0/+15
|\ \ \ | | | | | | | | | | | | | | | | Adjust modal border radius to match design spec See merge request gitlab-org/gitlab-ce!30414
| * | | Define modal first and last child border-radiusmf-modal-style-border-radiusmfluharty2019-07-092-1/+12
| | | | | | | | | | | | | | | | Use $modal-border-radius for all modal border radius definitions
| * | | Adjust modal border radius to match design specmfluharty2019-07-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set modal border radius to 0.25rem With 16px default font size, should match the 4px from the design spec Before this, it was the bootstrap default (0.3rem = 4.8px)
* | | | Merge branch 'fixed-dropdown-hover-styles' into 'master'Annabel Dunstone Gray2019-07-103-5/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed dropdown hover styles Closes #64330 and #64340 See merge request gitlab-org/gitlab-ce!30534
| * | | | Fixed dropdown hover stylesPhil Hughes2019-07-093-5/+48
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64340
* | | | | Merge branch 'winh-eslint-import-resolver-jest-workaround' into 'master'Clement Ho2019-07-102-2/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround ESLint only resolving paths in test files Closes #64061 See merge request gitlab-org/gitlab-ce!30296
| * | | | | Workaround ESLint only resolving paths in test filesWinnie Hellmann2019-07-102-2/+11
|/ / / / /
* | | | | Merge branch ↵Clement Ho2019-07-103-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboard' into 'master' Fix wrong URL when creating milestones from instance milestones dashboard Closes #64321 See merge request gitlab-org/gitlab-ce!30512
| * | | | | Fix invalid milestone URL for new milestone dropdown64321-wrong-url-when-creating-milestones-from-instance-milestones-dashboardDmitriy Zaporozhets2019-07-093-1/+20
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'embedded-metrics-be-2' into 'master'Dmitriy Zaporozhets2019-07-1010-0/+424
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose placeholder element for metrics charts in GFM See merge request gitlab-org/gitlab-ce!29861
| * | | | | Expose metrics element for FE consumptionSarah Yasonik2019-07-1010-0/+424
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds GFM Pipline filters to insert a placeholder in the generated HTML from GFM based on the presence of a metrics dashboard link. The front end should look for the class 'js-render-metrics' to determine if it should replace the element with metrics charts. The data element 'data-dashboard-url' should be the endpoint the front end should hit in order to obtain a dashboard layout in order to appropriately render the charts.
* | | | | Merge branch 'link-help-path-epic-in-dev-docs' into 'master'Achilleas Pipinellis2019-07-101-3/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | In /development/documentation page, add link to epic for removing /help See merge request gitlab-org/gitlab-ce!30550
| * | | | | Add link to epic for removing /helplink-help-path-epic-in-dev-docsMike Lewis2019-07-101-3/+6
| | | | | |
* | | | | | Merge branch 'update-clair-version' into 'master'Thong Kuah2019-07-102-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Clair Version V8 to V11 See merge request gitlab-org/gitlab-ce!30396
| * | | | | | Update Clair Version V8 to V11Can Eldem2019-07-102-1/+8
|/ / / / / /
* | | | | | Merge branch 'i18n-projects-new' into 'master'Bob Van Landuyt2019-07-104-23/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of page '/projects/new' See merge request gitlab-org/gitlab-ce!30447
View Lorry Controller Status