summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document JupyterHub is available for group-level clustersdocs-group-level-jupyterhubJames Fargher2019-09-061-3/+5
|
* Merge branch 'group_level_jupyterhub' into 'master'Robert Speicher2019-09-057-30/+87
|\ | | | | | | | | Group level JupyterHub See merge request gitlab-org/gitlab-ce!32512
| * Allow group install of JupyterHubgroup_level_jupyterhubJames Fargher2019-09-055-28/+49
| | | | | | | | Removes limitations on cluster types that can install JupyterHub
| * Allow JupyterHub in group level UIJames Fargher2019-09-052-2/+38
| |
* | Merge branch 'instance-level-security-dashboard-ce' into 'master'Mike Greiling2019-09-051-0/+1
|\ \ | | | | | | | | | | | | Adds route for instance level security dashboard See merge request gitlab-org/gitlab-ce!32548
| * | Adds route for instance level security dashboardMark Florian2019-09-051-0/+1
|/ /
* | Merge branch 'add-approval-status-field-lm-ce' into 'master'Rémy Coutable2019-09-051-2/+2
|\ \ | | | | | | | | | | | | Extend License Compliance entity for Pipelines and MR view See merge request gitlab-org/gitlab-ce!32709
| * | Extend License Compliance entity for Pipelines and MR viewCan Eldem2019-09-051-2/+2
|/ /
* | Merge branch 'dag-setup-test-env' into 'master'Rémy Coutable2019-09-055-7/+23
|\ \ | | | | | | | | | | | | DAG changes for setup-test-env and review-deploy See merge request gitlab-org/gitlab-ce!32366
| * | Add DAG to setup-test-env jobs and review-cng-base to speed up pipelinedag-setup-test-envKyle Wiebers2019-09-055-7/+23
| | | | | | | | | | | | | | | | | | Add needs for all jobs which require setup-test-env and move review-build-cng to additional stage review-prepare to decrease wait time for jobs in pipeline
* | | Merge branch 'danger-review-pipeline' into 'master'Rémy Coutable2019-09-054-3/+23
|\ \ \ | | | | | | | | | | | | | | | | Add Danger Roulette rules for pipeline files See merge request gitlab-org/gitlab-ce!32616
| * | | Add Danger Roulette rules for pipeline filesdanger-review-pipelineKyle Wiebers2019-09-054-3/+23
| | | |
* | | | Merge branch '67037-user-content-gitlab-static-net-brings-back-404-only' ↵Sean McGivern2019-09-053-1/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "user-content.gitlab-static.net brings back 404 only" See merge request gitlab-org/gitlab-ce!32703
| * | | | Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-onlyBrett Walker2019-09-053-1/+21
| | |/ / | |/| |
* | | | Merge branch 'update-issue-template-for-permissions' into 'master'Achilleas Pipinellis2019-09-051-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add note about updating permissions See merge request gitlab-org/gitlab-ce!32700
| * | | | Add note about updating permissionsTetiana Chupryna2019-09-051-2/+3
|/ / / /
* | | | Merge branch 'update_user_group_name' into 'master'Achilleas Pipinellis2019-09-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update user permission group name Closes #65975 See merge request gitlab-org/gitlab-ce!32321
| * | | | Update user permission nameNikita Potapenko2019-08-281-1/+1
| | | | |
* | | | | Merge branch 'issue-32741' into 'master'Kamil Trzciński2019-09-0516-12/+356
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Interruptible builds for redundant pipelines See merge request gitlab-org/gitlab-ce!23464
| * | | | New interruptible attribute supported in YAML parsing.Cédric Tabin2019-09-0516-12/+356
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* | | | Merge branch 'docs-markdown-guidelines' into 'master'Marcia Ramos2019-09-052-66/+39
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Update doc guidelines with markdownlint info See merge request gitlab-org/gitlab-ce!32273
| * | | Adjust markdown linting guidelinesMarcel Amirault2019-09-052-66/+39
|/ / / | | | | | | | | | | | | Move details of markdownlint mostly to the documentation index for a SSoT, and link apropriately
* | | Merge branch 'ashmckenzie/provide_gl-type_to_gitlab_shell' into 'master'Nick Thomas2019-09-054-29/+188
|\ \ \ | | | | | | | | | | | | | | | | Extract /internal/allowed API Actor logic out See merge request gitlab-org/gitlab-ce!31564
| * | | Extract /internal/allowed API Actor logic outashmckenzie/provide_gl-type_to_gitlab_shellAsh McKenzie2019-09-054-29/+188
| | | | | | | | | | | | | | | | | | | | | | | | Created new API::Support::GitAccessActor class to encapsulate some of the more edge logic, making the /internal/allowed route much cleaner.
* | | | Merge branch '10395-require-code-owner-approval-on-pushes' into 'master'Nick Thomas2019-09-057-4/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | EE->CE: Structure for "Require code owner approval on pushes" See merge request gitlab-org/gitlab-ce!32607
| * | | | Add structure to support EE feature of COARKerri Miller2019-09-057-4/+51
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | These are the structural changes for supporting the EE feature of moving "code_owner_approval_required" state from existing on a project to being on the protected branches individually, allowing for CODEOWNER validation on push events.
* | | | Merge branch 'mh/wait-for-requests' into 'master'Paul Slaughter2019-09-054-14/+113
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper to wait for axios requests in frontend tests Closes #60972 See merge request gitlab-org/gitlab-ce!30887
| * | | | Add helpers to wait for axios requestsMartin Hanzel2019-09-054-14/+113
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two methods to the axios_utils Jest mock: - `waitFor(url)`, which returns a Promise that resolves when the next request to `url` finishes. - `waitForAll()`, which returns a Promise that resolves when all pending requests finish.
* | | | Merge branch 'ce-xanf-migrate-clientside-spec-to-jest' into 'master'Paul Slaughter2019-09-052-363/+318
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Migrate spec/javascripts/ide/components/preview/clientside_spec.js to Jest" See merge request gitlab-org/gitlab-ce!32294
| * | | | Refactored spec to Jest for clientside_specIllya Klymov2019-09-052-363/+318
|/ / / /
* | | | Merge branch 'refactor_new_migration_helpers' into 'master'Andreas Brandl2019-09-052-39/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor new undo_cleanup_concurrent_column_rename migration helper See merge request gitlab-org/gitlab-ce!32343
| * | | | Refactor new undo_* methodsReuben Pereira2019-09-052-39/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | - Move code for creating a new column from old into a function so that it can be reused. - Also add comments above the methods.
* | | | Merge branch ↵Peter Leitzen2019-09-055-36/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66150-remove-dynamically-constructed-feature-flags-starting-with-prometheus_transaction_' into 'master' Resolve "Remove dynamically constructed feature flags starting with `prometheus_transaction_`" Closes #66150 See merge request gitlab-org/gitlab-ce!32395
| * | | | Remove feature flags starting with `prometheus_transaction_`Jacopo2019-09-055-36/+13
| | | | | | | | | | | | | | | | | | | | Those feature flags were always enabled so we can remove them safely.
* | | | | Merge branch '66067-pages-domain-doesnt-set-target-blank' into 'master'Dmitriy Zaporozhets2019-09-056-8/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes custom Pages domain open as external link in new tab Closes #66067 See merge request gitlab-org/gitlab-ce!32130
| * | | | | Allow for the passing of options to external_link66067-pages-domain-doesnt-set-target-blankjakeburden2019-09-032-2/+7
| | | | | |
| * | | | | Create and use external_link helperjakeburden2019-09-036-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a helper method that takes body text and a url. The output is a external link with icon. It contains the noopenner noreferrer attributes for security. Usage: external_link(domain.title, domain.url) Add rspec test for ExternalLinkHelper Add changelog for MR 32130
| * | | | | Use “_blank” instead of :_blankjakeburden2019-09-022-3/+3
| | | | | |
| * | | | | Add attributes to open deployed pages in new tabjakeburden2019-09-021-2/+8
| | | | | |
| * | | | | Add attributes to securely open external linksjakeburden2019-09-021-1/+1
| | | | | |
| * | | | | Makes Page domain open as external link in new tabjakeburden2019-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Additionally adds noopener noreferrer as addtional security
* | | | | | Merge branch ↵Achilleas Pipinellis2019-09-055-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard' into 'master' Update security dashboards documentation See merge request gitlab-org/gitlab-ce!32674
| * | | | | | Update security dashboards documentationPaul Gascou-Vaillancourt2019-09-055-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Reflect the addition of a "hide dismissed vulnerabilities" toggle in security dashboards, see https://gitlab.com/gitlab-org/gitlab-ee/issues/9102
* | | | | | Merge branch 'winh-frontend-ci-roulette' into 'master'Paul Slaughter2019-09-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .gitlab/ci/frontend.gitlab-ci.yml to frontend review roulette See merge request gitlab-org/gitlab-ce!32466
| * | | | | | Add .gitlab/ci/frontend.gitlab-ci.yml to frontend review rouletteWinnie Hellmann2019-09-051-1/+2
|/ / / / / /
* | | | | | Merge branch 'bjk/routable_counter' into 'master'Andreas Brandl2019-09-051-8/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust routable metric See merge request gitlab-org/gitlab-ce!32591
| * | | | | | Adjust routable metricbjk/routable_counterBen Kochie2019-09-051-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define the counter once. * Make metric name follow Prometheus naming conventions. * Add label for call method.
* | | | | | | Merge branch 'fj-remove-dns-protection-when-validating' into 'master'Thong Kuah2019-09-053-1/+49
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid checking dns rebind protection in validation Closes #66723 See merge request gitlab-org/gitlab-ce!32577
| * | | | | | Avoid checking dns rebind protection in validationFrancisco Javier López2019-09-053-1/+49
|/ / / / / /
* | | | | | Merge branch 'docs-serveo-link' into 'master'Achilleas Pipinellis2019-09-051-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change serveo link as it often goes down See merge request gitlab-org/gitlab-ce!32680
View Lorry Controller Status