summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add feature flag and dashboard endpointprom-api-2Simon Knox2019-06-0712-13/+266
| | | | | | First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* Switch errors to inherit from a base classprom-api-1syasonik2019-06-065-25/+26
| | | | | | | | | | Error classes associated with individual stages of dashboard processing tend to have very long names. As dashboard post-processing includes more steps, we will likely need to handle more error cases. Refactoring to have all errors inherit from a specific base class will help accommodate this and keep the code more readable.
* Address rubocop errorssyasonik2019-06-062-3/+5
|
* Expose prometheus endpoint per metric in dashboardsyasonik2019-06-068-8/+81
| | | | | | | | Adds a new stage to dashboard processesing step for the EnvironmentsController::metrics_dashboard endpoint. Allows the front end to avoid generating the endpoint unitutive string mutations.
* Named route for prometheus proxy_pathSimon Knox2019-06-061-1/+1
|
* Return no_content from prometheus API empty responseSimon Knox2019-06-062-3/+3
|
* Merge branch 'copy-button-in-modals' into 'master'Filipa Lacerda2019-06-064-0/+180
|\ | | | | | | | | | | | | Add a New Copy Button That Works in Modals Closes #60988 See merge request gitlab-org/gitlab-ce!28676
| * Add a New Copy Button That Works in ModalsAndrew Fontaine2019-06-064-0/+180
|/ | | | | | | | | | | | This copy button manages a local instance of the Clipboard plugin specific to it, which means it is created/destroyed on the creation/destruction of the component. This allows it to work well in gitlab-ui modals, as the event listeners are bound on creation of the button. It also allows for bindings to the `container` option of the Clipboard plugin, which allows it to work within the focus trap set by bootstrap's modals.
* Merge branch 'always-show-pipelines-must-succeed-checkbox' into 'master'Filipa Lacerda2019-06-064-7/+7
|\ | | | | | | | | | | | | Always show "Pipelines must succeed" checkbox Closes #57291 See merge request gitlab-org/gitlab-ce!28651
| * Always show "Pipelines must succeed" checkboxFabio Pitino2019-06-064-7/+7
|/ | | | | | | Before: the checkbox was hidden if builds were disabled. The checkbox should not be linked to the builds feature because they are 2 separate functionality.
* Merge branch 'sh-default-visibility-fix' into 'master'Bob Van Landuyt2019-06-065-1/+119
|\ | | | | | | | | | | | | Set project default visibility to max allowed Closes #62298 See merge request gitlab-org/gitlab-ce!28754
| * Apply suggestion to app/helpers/visibility_level_helper.rbsh-default-visibility-fixBob Van Landuyt2019-06-061-1/+1
| |
| * Set project default visibility to max allowedStan Hu2019-06-055-1/+119
| | | | | | | | | | | | | | | | | | | | If the default, instance-wide visibility were set to internal but a group were private, the radio button would be set on internal even though that setting were not allowed. We now consider the allowed visibility setting for the group in determining what the default should be. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62298
* | Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil Trzciński2019-06-0624-264/+957
|\ \ | | | | | | | | | | | | CI variable expression conjunction/disjunction See merge request gitlab-org/gitlab-ce!27925
| * | && and || operators for CI Pipeline expressions.drew cimino2019-06-0424-264/+957
| | | | | | | | | | | | | | | | | | Refactored regex pattern matching to eagerly return tokens Packaged behind a default-enabled feature flag and added operator documentation.
* | | Merge branch 'revert-86900f00' into 'master'Grzegorz Bizon2019-06-067-19/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Disable retrying cancelled jobs" Closes #62350 See merge request gitlab-org/gitlab-ce!29201
| * | | Revert "Merge branch..."revert-86900f00Kamil Trzciński2019-06-057-19/+16
| | | | | | | | | | | | This reverts merge request !27503
* | | | Merge branch 'docs/port-insights-from-ee' into 'master'Achilleas Pipinellis2019-06-061-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE changes from doc/user/project/insights/index.md Closes gitlab-ee#11974 See merge request gitlab-org/gitlab-ce!29252
| * | | | Port EE changes from doc/user/project/insights/index.mdAchilleas Pipinellis2019-06-061-1/+2
| | | | |
* | | | | Merge branch '62760-quarantine-it' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine spec/models/ci/pipeline_schedule_spec.rb Closes #62760 See merge request gitlab-org/gitlab-ce!29257
| * | | | | Quarantine this flaky testLin Jen-Shin2019-06-061-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/62760
* | | | | Merge branch 'docs-api-merge-2' into 'master'Achilleas Pipinellis2019-06-065-105/+378
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge 5 api docs from EE to CE See merge request gitlab-org/gitlab-ce!28633
| * | | | | Docs: Merge 5 api docs from EE to CEMarcel Amirault2019-06-065-105/+378
|/ / / / /
* | | | | Merge branch 'simplify-pipeline-notification-check' into 'master'Sean McGivern2019-06-062-13/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify notification check for participating See merge request gitlab-org/gitlab-ce!29188
| * | | | | Simplify notification check for participatingsimplify-pipeline-notification-checkHeinrich Lee Yu2019-06-062-13/+4
| | | | | |
* | | | | | Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'Sean McGivern2019-06-068-4/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 10854-elasticsearch_avoid_db See merge request gitlab-org/gitlab-ce!28579
| * | | | | | Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_dbMario de la Ossa2019-06-058-4/+15
| | | | | | |
* | | | | | | Merge branch 'docs/ssot_saml_sso' into 'master'Achilleas Pipinellis2019-06-061-7/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit "SAML SSO" for SSOT See merge request gitlab-org/gitlab-ce!29248
| * | | | | | | Edit "SAML SSO" for SSOTRussell Dickenson2019-06-061-7/+23
|/ / / / / / /
* | | | | | | Merge branch 'docs/ssot_roadmap' into 'master'Achilleas Pipinellis2019-06-061-2/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Group's "Roadmap" for SSOT See merge request gitlab-org/gitlab-ce!29245
| * | | | | | | Edit Group's "Roadmap" for SSOTRussell Dickenson2019-06-061-2/+25
|/ / / / / / /
* | | | | | | Merge branch '60323-inline-validation-for-users-name-and-username-length' ↵Kushal Pandya2019-06-069-44/+138
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Inline validation for user's name and username length" Closes #60323 See merge request gitlab-org/gitlab-ce!28095
| * | | | | | | Resolve "Inline validation for user's name and username length"Jiaan2019-06-069-44/+138
|/ / / / / / /
* | | | | | | Merge branch 'docs/fix-bullet-list-ha' into 'master'Achilleas Pipinellis2019-06-061-53/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown for HA topic See merge request gitlab-org/gitlab-ce!29244
| * | | | | | | Fix markdown for HA topicEvan Read2019-06-061-53/+48
|/ / / / / / /
* | | | | | | Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵Phil Hughes2019-06-0617-112/+377
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Default Web IDE's merge request checkbox to true" Closes #60034 See merge request gitlab-org/gitlab-ce!28665
| * | | | | | | Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-trueSam Bigelow2019-06-0617-112/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pull the new MR option out into it's own component - Default MR checkbox to true when creating a new MR and committing to a branch that does not have an MR - Still change the MR checkbox to false when a user is on a branch that already has an MR - Hide MR option when on a branch that already has an MR and committing to current branch - Don't default to true when committing directly to master
* | | | | | | | Merge branch 'create-merge-request-create-pipeline-service' into 'master'Bob Van Landuyt2019-06-063-25/+109
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce service for merge request pipeline creation See merge request gitlab-org/gitlab-ce!28781
| * | | | | | | | Introduce service for merge request pipeline creationcreate-merge-request-create-pipeline-serviceShinya Maeda2019-06-063-25/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have a way to create MR pipeline today, this is one of the headaches for users. This change is a preliminary work for the capability.
* | | | | | | | | Merge branch 'ce-10795-add-epic-tree' into 'master'Phil Hughes2019-06-064-4/+242
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Show tree within Epic containing child Epics and Issues See merge request gitlab-org/gitlab-ce!28787
| * | | | | | | | | CE Backport: Show tree within Epic containing child Epics and IssuesKushal Pandya2019-06-064-4/+242
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/ssot_insights' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit "Insights" content to meet SSOT guidelines See merge request gitlab-org/gitlab-ce!29238
| * | | | | | | | | Edit "Insights" content to meet SSOT guidelinesRussell Dickenson2019-06-061-0/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/ssot_epics' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited "Epics" to comply with SSOT See merge request gitlab-org/gitlab-ce!29236
| * | | | | | | | | Edited "Epics" to comply with SSOTRussell Dickenson2019-06-061-0/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/ssot_custom_project_templates' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited "Custom group-level project templates" for SSOT See merge request gitlab-org/gitlab-ce!29235
| * | | | | | | | | Edited "Custom group-level project templates" for SSOTRussell Dickenson2019-06-061-0/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-time-window-default' into 'master'Phil Hughes2019-06-063-20/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the selected time window for metrics dashboard See merge request gitlab-org/gitlab-ce!29152
| * | | | | | | | | Use the selected time window for metrics dashboardSarah Yasonik2019-06-063-20/+57
|/ / / / / / / / /
* | | | | | | | | Merge branch '11213-add-docs-on-dast-weekly-update-ce' into 'master'Achilleas Pipinellis2019-06-061-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note on weekly updates of dast Docker image See merge request gitlab-org/gitlab-ce!29126