summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Quarantine flaky e2e testqa-quarantine-github-oauth-testMark Lapierre2019-08-011-1/+2
|
* Merge branch 'ce-mw-productivity-analytics-filter-bar' into 'master'Kushal Pandya2019-08-011-2/+3
|\ | | | | | | | | (CE Port) Add filters for Productivity Analytics See merge request gitlab-org/gitlab-ce!31097
| * (CE Port) Add filters for Productivity AnalyticsMartin Wortschack2019-08-011-2/+3
|/
* Merge branch 'snowplow-ee-to-ce' into 'master'Mike Greiling2019-08-014-48/+240
|\ | | | | | | | | Implements a js library for tracking using snowplow See merge request gitlab-org/gitlab-ce!31160
| * Adds new tracking interface for snowplowJeremy Jackson2019-08-014-48/+240
|/ | | | | This will ultimately replace the stats.js that exists in EE.
* Merge branch ↵Evan Read2019-08-011-27/+40
|\ | | | | | | | | | | | | '12398-compile-a-list-of-created-data-types-which-ones-are-replicated-verified-and-tested-docs' into 'master' Geo - Update list of unreplicated/unverified data types See merge request gitlab-org/gitlab-ce!31261
| * Update list of unreplicated/unverified data types12398-compile-a-list-of-created-data-types-which-ones-are-replicated-verified-and-tested-docsDouglas Barbosa Alexandre2019-07-311-27/+40
| |
* | Merge branch 'fix_broken_help_controller_spec' into 'master'Stan Hu2019-08-011-1/+1
|\ \ | | | | | | | | | | | | Fix broken spec from file rename See merge request gitlab-org/gitlab-ce!31360
| * | Fix broken spec from file renameThong Kuah2019-08-011-1/+1
|/ / | | | | | | b36323f3d26131405925bf86742b2b4acd786230
* | Merge branch 'docs-private-registry' into 'master'Evan Read2019-08-011-0/+6
|\ \ | | | | | | | | | | | | Add note about private container registry See merge request gitlab-org/gitlab-ce!31267
| * | Add note about private container registryAlexander Tanayno2019-08-011-0/+6
|/ /
* | Merge branch 'docs-fix-copy-config-command-puma' into 'master'Evan Read2019-08-011-1/+1
|\ \ | | | | | | | | | | | | Fix copy config command for Puma See merge request gitlab-org/gitlab-ce!31314
| * | Fix copy config command for Pumadocs-fix-copy-config-command-pumaAnton Smith2019-07-301-1/+1
| | |
* | | Merge branch 'docs-yarn-error-npm' into 'master'Evan Read2019-08-011-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add error message to npm registry doc Closes #61109 See merge request gitlab-org/gitlab-ce!31271
| * | | Add error message troubleshooting to npm registry docMarcel Amirault2019-08-011-0/+30
|/ / / | | | | | | | | | | | | | | | Add contributed error message and possible solution to npm registry doc, added to a new troubleshooting section added to the end of the doc.
* | | Merge branch 'patch-30' into 'master'Evan Read2019-08-011-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Docs: Jobs: use curl --location to follow redirects See merge request gitlab-org/gitlab-ce!31244
| * | | Jobs: use curl --location to follow redirectsDamian Nowak2019-07-291-3/+3
| | | | | | | | | | | | Required to fetch artifacts/logs if AWS is used as the storage backend.
* | | | Merge branch 'docs-code-block-style-8' into 'master'Evan Read2019-08-017-473/+477
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix whitespace in ci docs See merge request gitlab-org/gitlab-ce!30655
| * | | | Fix whitespace in ci docsMarcel Amirault2019-08-017-473/+477
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for most docs in /ci, and cleans up other minor whitespace issues too.
* | | | Merge branch '65363-add-feature-remove' into 'master'Stan Hu2019-08-012-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Feature.remove Closes #65363 See merge request gitlab-org/gitlab-ce!31315
| * | | | Add new Feature.remove method65363-add-feature-removeAsh McKenzie2019-08-012-0/+23
| | |/ / | |/| |
* | | | Merge branch 'docs-labels-update' into 'master'Evan Read2019-07-3122-52/+131
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update label documentation Closes #60160 See merge request gitlab-org/gitlab-ce!31093
| * | | | Update label documentationMarcel Amirault2019-07-3122-52/+131
|/ / / / | | | | | | | | | | | | | | | | | | | | Update label documentation with newer screenshots, cut long lines, and touch up the text, especially the delete label section. Also adds new screenshots for clarity
* | | | Merge branch '65297-fix-typo-on-clusters_applications_cert_managers-factory' ↵Thong Kuah2019-07-316-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Fix typo on clusters_applications_cert_managers factory" Closes #65297 See merge request gitlab-org/gitlab-ce!31278
| * | | | Remove typo from factory name65297-fix-typo-on-clusters_applications_cert_managers-factoryJoão Cunha2019-07-306-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | - the typo in this factory name was precluding us from properly creating dynamic code to remove duplciation.
* | | | | Merge branch 'jramsay/fix-mirroring-help-text-typo' into 'master'Nick Thomas2019-07-313-2/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix mirroring help text See merge request gitlab-org/gitlab-ce!31348
| * | | | Run rake gettext:regeneratejramsay/fix-mirroring-help-text-typoNick Thomas2019-07-311-1/+1
| | | | |
| * | | | Fix mirroring help textJames Ramsay2019-07-312-1/+6
| | | | |
* | | | | Merge branch 'ce-8240-add-percent-rollout-strategy-to-feature-flags-ui' into ↵Paul Slaughter2019-07-311-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE Port of Update feature flag UI to support percentage rollout See merge request gitlab-org/gitlab-ce!31240
| * | | | | Add percentage rollout support to feature flag UI (CE)Nathan Friend2019-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the feature flags pages to includes support for the percentage rollout strategy.
* | | | | | Merge branch 'sh-fix-special-role-error-500' into 'master'Douglas Barbosa Alexandre2019-07-313-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix first-time contributor notes not rendering Closes #65383 See merge request gitlab-org/gitlab-ce!31340
| * | | | | | Fix first-time contributor notes not renderingsh-fix-special-role-error-500Stan Hu2019-07-313-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31117 enabled the HashInefficientHash Rubocop rule that was fooled by the special implementation of `SpecialRole`. We fix this by introducing a `value?` method and adding unit tests. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65383
* | | | | | | Merge branch '56883-add-to-whitelist' into 'master'Douwe Maan2019-07-317-20/+172
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Add prometheus listen address to whitelist See merge request gitlab-org/gitlab-ce!31148
| * | | | | | Add prometheus listen address to whitelistReuben Pereira2019-07-317-20/+172
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add to whitelist so that even if local requests from hooks and services are not allowed, the prometheus manual configuration will still succeed.
* | | | | | Merge branch '61776-fixing-the-U2F-warning-message-text-colour' into 'master'Annabel Dunstone Gray2019-07-312-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the warning style from the "U2F device message" paragraph Closes #61776 See merge request gitlab-org/gitlab-ce!30119
| * | | | | Removes the warning style from the paragraph61776-fixing-the-U2F-warning-message-text-colourMatej Latin2019-07-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | In U2F device message, removes warning style
* | | | | | Merge branch '4221-board-milestone-should-persist-any-none-properly-ce' into ↵Paul Slaughter2019-07-317-23/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' For milestone filters, treat `Any` as `No filter` See merge request gitlab-org/gitlab-ce!30613
| * | | | | | Port CE changes from EEcharlie ablett2019-07-317-23/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - DB migration of board milestone values - issue finder & spec updates
* | | | | | Merge branch 'add-project-scope-to-live-trace-feature-flag' into 'master'Lin Jen-Shin2019-07-311-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project scope to live trace feature flag See merge request gitlab-org/gitlab-ce!31325
| * | | | | | Add project scope to live trace feature flagadd-project-scope-to-live-trace-feature-flagShinya Maeda2019-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project scope
* | | | | | | Merge branch 'fix-sidekiq-memory-killer-warn-message' into 'master'Stan Hu2019-07-312-3/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sidekiq memory killer warning message Closes gitlab-com/gl-infra/infrastructure#7371 See merge request gitlab-org/gitlab-ce!31264
| * | | | | | | Fix sidekiq memory killer warning messagefix-sidekiq-memory-killer-warn-messageShinya Maeda2019-07-302-3/+6
| | | | | | | |
* | | | | | | | Merge branch 'ajk-handle-gql-errors' into 'master'Sean McGivern2019-07-312-0/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate argument errors as execution errors See merge request gitlab-org/gitlab-ce!31249
| * | | | | | | | Propagate argument errors as execution errorsajk-handle-gql-errorsAlex Kalderimis2019-07-302-0/+25
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'an-sidekiq-scheduling_latency' into 'master'Kamil Trzciński2019-07-313-5/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Sidekiq scheduling latency structured logging field Closes #64649 See merge request gitlab-org/gitlab-ce!30784
| * | | | | | | | Adds Sidekiq scheduling latency structured logging fieldAndrew Newdigate2019-07-313-5/+50
|/ / / / / / / /
* | | | | | | | Merge branch 'report-missing-job-dependency' into 'master'Kamil Trzciński2019-07-313-1/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for dependency job stage index before comparison Closes #59366 See merge request gitlab-org/gitlab-ce!31116
| * | | | | | | | Default dependency job stage index to Infinity, and correctly report it as ↵drew2019-07-313-1/+34
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | undefined in prior stages
* | | | | | | | Merge branch '60668-kubernetes-applications-uninstall-knative' into 'master'Dmitriy Zaporozhets2019-07-3113-24/+188
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Kubernetes > Applications > Uninstall Knative" See merge request gitlab-org/gitlab-ce!30458
| * | | | | | | | Allow knative do be uninstalled:João Cunha2019-07-3113-24/+188
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - After uninstalling the knative helm chart it's necessary to also remove some leftover resources to allow the cluster to be clean and knative to be reinstalleable. - Adds knative uninstall disclaimer - Uninstall ksvc before uninstalling knative Make list of Knative and Ingres resources explicit - To avoid deleting unwanted resources we are listing exact which resources will be deleted rather than simply deleting any resource that contains istio or knative words.