Stan Hu
db9783f782
Merge branch 'refactor_deployment_cluster' into 'master'
...
Refactor Deployment#cluster to #deployment_platform_cluster
See merge request gitlab-org/gitlab-ce!29961
2019-06-24 22:23:18 +00:00
Kamil Trzciński
e11feff929
Revert "Merge branch..."
...
This reverts merge request !29832
2019-06-24 17:29:54 +00:00
Thong Kuah
d9f4a91945
Merge branch '60617-enable-project-cluster-jit' into 'master'
...
Enable JIT Kubernetes resource creation for project level clusters
See merge request gitlab-org/gitlab-ce!29515
2019-06-24 05:16:31 +00:00
Thong Kuah
ee18ca2fa5
Rename method to not clash with #cluster
...
We will introduce #cluster at a later stage.
Also deprecate this method
2019-06-24 16:59:22 +12:00
Stan Hu
868da1d6c8
Merge branch '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master'
...
Fix copying a single line from Firefox
Closes #63406
See merge request gitlab-org/gitlab-ce!29832
2019-06-21 13:11:56 +00:00
drew cimino
f3b2dde8e2
Enabled complex ci variable expression statements by default
2019-06-20 11:53:21 -04:00
Adam Hegyi
e76f12f7e7
Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also'
...
# Conflicts:
# spec/lib/gitlab/ci/ansi2html_spec.rb
2019-06-19 13:39:52 +00:00
Kamil Trzciński
22755a4aa2
Merge branch '63417-add-missing-class' into 'master'
...
Adds missing class in collapsible sections
Closes #63417
See merge request gitlab-org/gitlab-ce!29804
2019-06-19 12:56:41 +00:00
Filipa Lacerda
d3a1468b62
Adds missing class
...
Will apply identation from
CSS to collapsible sections
2019-06-19 11:58:11 +01:00
Adam Hegyi
86c08225eb
Fix copying a single line from Firefox
...
This change ensures that all open <span> tags are closed before adding a
<br> tag.
2019-06-19 09:16:53 +02:00
Philippe Lafoucrière
2a6dab97d9
Fix Container Scanning job with K8S runners
2019-06-19 06:31:22 +00:00
Lin Jen-Shin
073a65fe49
Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'
...
Use new Code Quality job definition in Auto DevOps
See merge request gitlab-org/gitlab-ce!29475
2019-06-18 15:33:44 +00:00
Kamil Trzciński
505d71ec88
Introduce default: for gitlab-ci.yml
...
This moves all existing `image/services/before_script/variables`
into `default:`. This allows us to easily add a default and
top-level entries. `default`: is keep backward compatible: to
be considered to be job if `default:script:` is specified. This
behavior should be removed.
All existing `image/services/before_script/variables` are properly
handled in root context.
2019-06-18 10:36:07 +00:00
Grzegorz Bizon
077bb1b299
Merge branch 'mc/feature/required-template-inclusion-single-commit-ce' into 'master'
...
Enforce template inclusion in pipelines - CE
See merge request gitlab-org/gitlab-ce!29296
2019-06-18 08:04:32 +00:00
Tiger
74702f0e0e
Enable project-level JIT resource creation
...
Previously this behaviour was only available to group
and instance-level clusters, as some project clusters
relied on Kubernetes credentials being passed through
to the runner instead of having their resources managed
by GitLab (which is not available when using JIT). These
clusters have been migrated to unmanaged, so resources
can be created on demand for the remaining managed clusters.
2019-06-18 12:43:52 +10:00
Thong Kuah
12d262c23f
Merge branch '55362-refresh-blank-service-account-token' into 'master'
...
Refresh service_account_token for kubernetes_namespaces
See merge request gitlab-org/gitlab-ce!29657
2019-06-17 22:28:36 +00:00
Matija Čupić
7ac3723be0
Backport CE changes
...
Backports CE changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14011/
2019-06-17 21:53:09 +02:00
Sean McGivern
2634cad695
Merge branch 'generate-spans-for-sections' into 'master'
...
Add collapsible sections to job log
See merge request gitlab-org/gitlab-ce!28642
2019-06-17 17:03:41 +00:00
Fabio Pitino
d75a4ddab2
Remove unused line
2019-06-17 17:09:29 +01:00
Fabio Pitino
cd6fc8b81f
Compact syntax for default class names
2019-06-17 15:21:27 +01:00
drew cimino
396348dd17
Return boolean from Lexeme::Matches#evaluate
2019-06-14 17:58:42 -04:00
Fabio Pitino
6ab9a9df6f
Fix integration specs for tracing
2019-06-14 16:48:33 +01:00
Fabio Pitino
e2daebdc47
Merge branch 'generate-spans-for-sections' of https://gitlab.com/gitlab-org/gitlab-ce into generate-spans-for-sections
2019-06-14 15:44:48 +01:00
Fabio Pitino
ad96cc0ed7
Fixing specs
2019-06-14 15:43:43 +01:00
Matija Čupić
f0773d9ec8
Refactor Code Quality templates into single file
2019-06-14 14:05:49 +02:00
Filipa Lacerda
af55b42950
Update class names
2019-06-14 10:03:53 +01:00
Dylan Griffith
ee28255b21
Refresh service_account_token for kubernetes_namespaces
...
There seems to be several examples where service_account_token is blank
even in GitLab.com newly created kubernetes_namespaces . We have not
figured out why they are blank but this should hopefully fix some issues
similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/55362
2019-06-14 16:00:54 +10:00
Jack Lei
0b75ef09d2
AutoDevops fix ensure_namespace() does not explicitly test namespace
2019-06-13 22:09:28 +00:00
drew cimino
cbb05dcad9
Disable CI variable complex expressions by default
2019-06-13 06:29:41 -07:00
Avielle Wolfe
7da9a81496
Move SAST docker changes to CE
2019-06-12 13:22:15 -04:00
Filipa Lacerda
9f832e59ab
Adds margins to the section lines
2019-06-12 16:31:22 +01:00
Filipa Lacerda
4e249e542c
Moves JS into the vue component
2019-06-12 13:03:07 +01:00
Filipa Lacerda
0b080f8c8a
Merge branch 'master' into generate-spans-for-sections
...
* master: (784 commits)
Update Serverless.gitlab-ci-yml to fix lint warning
Document when milestones and labels links are missing
Update git object deduplication overview
Apply tooltip on truncated commit title
Add link to import video
Update merge options for auto merge strategies
Update note style in various docs
Add link to Auto DevOps demo video
Add link to Groups video
Remove glossary content and make necessary doc edits to clarify terms
Docs for Gitlab Runner docker use of private registries
Metrics reports documentation is incomplete
Update issues/index.md with note on label priority sorting
API issues - minor cleanup of permission check
Fix gl_dropdown scrolling to top on assignee click
Final doc review
Remove docs for a removed ES rake task
Fixed markdown link in Docker compose note
Documented the Admin Area's *Groups* page
Docs: Updating issue data and actions doc
...
2019-06-12 10:28:58 +01:00
Marcel Amirault
3289a47f0a
Update Serverless.gitlab-ci-yml to fix lint warning
2019-06-12 07:48:12 +00:00
Grzegorz Bizon
ca7a935159
Fix typo in a changelog description
...
[ci skip]
2019-06-06 12:14:29 +00:00
Grzegorz Bizon
e882954321
Fix serverless app deployments by bumping `tm` version
...
Previous version of the `tm` tool had a bug that resulted in not being
able to deploy serverless applications using this version.
2019-06-06 12:14:19 +00:00
Grzegorz Bizon
7f52685a41
Remove build policies from serverless app template
2019-06-06 10:52:29 +00:00
Kamil Trzciński
502cbda11b
Merge branch 'ci-variable-expression-con-dis-junction' into 'master'
...
CI variable expression conjunction/disjunction
See merge request gitlab-org/gitlab-ce!27925
2019-06-06 08:34:57 +00:00
Dmitriy Zaporozhets
93d4353be9
Merge branch 'trizzi-master-patch-43016' into 'master'
...
Update maven template with correct link
See merge request gitlab-org/gitlab-ce!29149
2019-06-05 19:47:29 +00:00
Kamil Trzciński
d2cc841c55
Add yaml lint
...
This commit adds CI job that validates all `*.yml`
with `yamllint`.
This commit fixes all offenses present in repository.
2019-06-05 16:31:35 +00:00
Wolphin
1f2244f16b
Add multiple extends support
2019-06-05 08:25:55 +00:00
drew cimino
cfaac75322
&& and || operators for CI Pipeline expressions.
...
Refactored regex pattern matching to eagerly return tokens
Packaged behind a default-enabled feature flag and added operator documentation.
2019-06-04 19:03:24 -05:00
Mayra Cabrera
4c27abb42f
Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'
...
Bump Helm version in Auto-DevOps.gitlab-ci.yml
See merge request gitlab-org/gitlab-ce!28527
2019-06-04 17:06:56 +00:00
Tim Rizzi
3f1f12645d
Update maven template with correct link
2019-06-04 15:59:31 +00:00
Dmitriy Zaporozhets
d2ea615415
Merge branch 'trizzi-master-patch-86505' into 'master'
...
Update maven.gitlab-ci.yml for GitLab Package
See merge request gitlab-org/gitlab-ce!28796
2019-06-04 12:01:26 +00:00
Thong Kuah
55e1906df7
Bump Helm version in Auto-DevOps.gitlab-ci.yml
...
See https://github.com/helm/helm/releases/tag/v2.14.0
for upstream changelog
2019-06-04 14:54:57 +12:00
Tim Rizzi
efca1cb365
Clarify error message and image in yml
2019-06-03 18:00:55 +00:00
Francisco Javier López
7eafe90b90
Fix port validations in .gitlab-webide.yml
2019-06-01 12:37:29 +02:00
Tim Rizzi
e08219b6ea
Update yml file comments re: deploy
2019-05-30 23:16:46 +00:00
Tim Rizzi
9cb74edbba
Update instructions and uncomment out deploy
2019-05-30 21:13:12 +00:00