8a725bfbbd
Adds documentation for vulnerability dismissal reasons
2019-06-06 14:17:44 +00:00
be0e2f6eb4
Merge branch '60852-update-or-upgrade' into 'master'
...
Use "update" instead of "upgrade" in Clusters -> Managed Apps
Closes #60852
See merge request gitlab-org/gitlab-ce!29207
2019-06-06 14:15:40 +00:00
940c812d5e
Replace upgrade with update
...
Use update term instead of update in the clusters managed app
implementation in order to make the implementation and UI
language more consistent.
2019-06-06 14:15:39 +00:00
431f33fe8e
Merge branch 'jv-catfile-limit-test-only' into 'master'
...
Only use Gitaly catfile_cache_size=5 in test
See merge request gitlab-org/gitlab-ce!29264
2019-06-06 14:11:45 +00:00
2d4447808d
Only use Gitaly catfile_cache_size=5 in test
2019-06-06 14:11:44 +00:00
e5aba4b153
Merge branch 'revert-a05f86ce' into 'master'
...
Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"
Closes #62861
See merge request gitlab-org/gitlab-ce!29273
2019-06-06 14:00:17 +00:00
10dcfac1f1
Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"
...
This reverts merge request !28743
2019-06-06 13:57:50 +00:00
64c6987dfd
Merge branch 'sh-fix-issue-55869' into 'master'
...
Fix alignment of resend button in members page
Closes #55869
See merge request gitlab-org/gitlab-ce!28202
2019-06-06 13:43:38 +00:00
9f58857b29
Fix alignment of resend button in members page
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55869
2019-06-06 13:43:37 +00:00
a05f86cef1
Merge branch 'pages-domain_ssl-valid-period' into 'master'
...
Add certificate valid time to pages domain table
See merge request gitlab-org/gitlab-ce!28743
2019-06-06 13:20:16 +00:00
3aab750d07
Add certificate valid time to pages domain table
...
Save certificate validity time for pages domains on save
Fill validity time for existing pages domains in background migration
2019-06-06 13:20:15 +00:00
0a5020b494
Merge branch 'ce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionality' into 'master'
...
Update docs for Elasticsearch indexing tasks
See merge request gitlab-org/gitlab-ce!29132
2019-06-06 13:11:42 +00:00
deb0c1dbb5
Merge branch 'ce-update-es-indexer' into 'master'
...
CE port of "Update the elasticsearch indexer"
See merge request gitlab-org/gitlab-ce!29237
2019-06-06 12:18:39 +00:00
b34506b54a
Merge branch 'feature/gb/use-gitlabktl-to-build-serverless-applications' into 'master'
...
Use `gitlabktl` to build serverless applications
Closes #61184
See merge request gitlab-org/gitlab-ce!29258
2019-06-06 12:14:30 +00:00
ca7a935159
Fix typo in a changelog description
...
[ci skip]
2019-06-06 12:14:29 +00:00
5b77fa8c56
Merge branch 'fix/gb/fix-serverless-apps-deployment-template' into 'master'
...
Fix serverless apps deployments by bumping `tm` version
Closes #62543
See merge request gitlab-org/gitlab-ce!29254
2019-06-06 12:14:20 +00:00
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
9318fba9cb
Merge branch '62706-graphql-complexity-values-are-incorrectly-doubled' into 'master'
...
Reduce GraphQL complexity for non-connection fields
Closes #62706
See merge request gitlab-org/gitlab-ce!29165
2019-06-06 11:54:30 +00:00
102c0e81fc
Merge branch 'enforce-template-uniqueness' into 'master'
...
Ensure that template is used once
See merge request gitlab-org/gitlab-ce!27511
2019-06-06 11:34:34 +00:00
52e88dfee7
Merge branch 'fix/gb/remove-serverless-app-build-policies-from-template' into 'master'
...
Remove build policies from serverless app template
Closes #62792
See merge request gitlab-org/gitlab-ce!29253
2019-06-06 10:52:30 +00:00
7f52685a41
Remove build policies from serverless app template
2019-06-06 10:52:29 +00:00
48ca0ddfa2
Merge branch '37495' into 'master'
...
Add docs link for confidential and locked issues
Closes #37495
See merge request gitlab-org/gitlab-ce!29073
2019-06-06 10:37:03 +00:00
fab72e2ad9
Add doc links for confidential and locked issues
...
With this commit, we add docs link for confidential
and locked issues to note compose and edit forms
2019-06-06 10:37:02 +00:00
076e16cb1c
Ensure that template is used once
...
This adds additional test that make sure that each
template name is used exactly once across all folders
exposed
2019-06-06 12:18:50 +02:00
26d57f9641
Merge branch '59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab.com-instances' into 'master'
...
Change "Report abuse to GitLab" to more generic wording.
Closes #59376
See merge request gitlab-org/gitlab-ce!28884
2019-06-06 10:05:42 +00:00
982463e944
Change "Report abuse to GitLab" to more generic wording.
2019-06-06 10:05:42 +00:00
e53f475e4a
Merge branch 'copy-button-in-modals' into 'master'
...
Add a New Copy Button That Works in Modals
Closes #60988
See merge request gitlab-org/gitlab-ce!28676
2019-06-06 09:36:18 +00:00
8bea9eeddf
Add a New Copy Button That Works in Modals
...
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.
2019-06-06 09:36:17 +00:00
7468ed5fd2
Merge branch 'always-show-pipelines-must-succeed-checkbox' into 'master'
...
Always show "Pipelines must succeed" checkbox
Closes #57291
See merge request gitlab-org/gitlab-ce!28651
2019-06-06 09:29:05 +00:00
8af83bbfec
Always show "Pipelines must succeed" checkbox
...
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.
2019-06-06 09:29:05 +00:00
5c3cab3d0f
Merge branch 'sh-default-visibility-fix' into 'master'
...
Set project default visibility to max allowed
Closes #62298
See merge request gitlab-org/gitlab-ce!28754
2019-06-06 08:49:15 +00:00
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
8501edcd46
Merge branch 'revert-86900f00' into 'master'
...
Revert "Disable retrying cancelled jobs"
Closes #62350
See merge request gitlab-org/gitlab-ce!29201
2019-06-06 08:32:04 +00:00
6e5d891e50
Merge branch 'docs/port-insights-from-ee' into 'master'
...
Port EE changes from doc/user/project/insights/index.md
Closes gitlab-ee#11974
See merge request gitlab-org/gitlab-ce!29252
2019-06-06 08:23:33 +00:00
4cd5e955d2
Merge branch '62760-quarantine-it' into 'master'
...
Quarantine spec/models/ci/pipeline_schedule_spec.rb
Closes #62760
See merge request gitlab-org/gitlab-ce!29257
2019-06-06 08:18:47 +00:00
765f30b80b
Quarantine this flaky test
...
See
https://gitlab.com/gitlab-org/gitlab-ce/issues/62760
2019-06-06 08:18:47 +00:00
11186a766a
Update docs for Elasticsearch indexing tasks
2019-06-06 10:08:06 +02:00
3353761680
Merge branch 'docs-api-merge-2' into 'master'
...
Docs: Merge 5 api docs from EE to CE
See merge request gitlab-org/gitlab-ce!28633
2019-06-06 07:57:40 +00:00
d46dca74ab
Docs: Merge 5 api docs from EE to CE
2019-06-06 07:57:39 +00:00
3fd99b4e7a
Merge branch 'simplify-pipeline-notification-check' into 'master'
...
Simplify notification check for participating
See merge request gitlab-org/gitlab-ce!29188
2019-06-06 07:51:33 +00:00
4fffd0ef5b
Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'
...
Backport of 10854-elasticsearch_avoid_db
See merge request gitlab-org/gitlab-ce!28579
2019-06-06 07:43:24 +00:00
c0acb06518
Merge branch 'docs/ssot_saml_sso' into 'master'
...
Edit "SAML SSO" for SSOT
See merge request gitlab-org/gitlab-ce!29248
2019-06-06 07:41:20 +00:00
eded1fc820
Edit "SAML SSO" for SSOT
2019-06-06 07:41:20 +00:00
cc8cbd9260
Merge branch 'docs/ssot_roadmap' into 'master'
...
Edit Group's "Roadmap" for SSOT
See merge request gitlab-org/gitlab-ce!29245
2019-06-06 07:40:43 +00:00
ac66b7b68f
Edit Group's "Roadmap" for SSOT
2019-06-06 07:40:42 +00:00
d91612ea0b
Merge branch '60323-inline-validation-for-users-name-and-username-length' into 'master'
...
Resolve "Inline validation for user's name and username length"
Closes #60323
See merge request gitlab-org/gitlab-ce!28095
2019-06-06 07:39:59 +00:00
c38ea7e884
Resolve "Inline validation for user's name and username length"
2019-06-06 07:39:59 +00:00
5caffe48a9
Merge branch 'docs/fix-bullet-list-ha' into 'master'
...
Fix markdown for HA topic
See merge request gitlab-org/gitlab-ce!29244
2019-06-06 07:39:52 +00:00
3fb5952efd
Fix markdown for HA topic
2019-06-06 07:39:52 +00:00
858d1fa7ed
Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into 'master'
...
Resolve "Default Web IDE's merge request checkbox to true"
Closes #60034
See merge request gitlab-org/gitlab-ce!28665
2019-06-06 07:38:42 +00:00
Sam Beckham
Phil Hughes
Enrique Alcántara
Stan Hu
Jacob Vosmaer
Nick Thomas
Vladimir Shushlin
Rémy Coutable
Kamil Trzciński
Grzegorz Bizon
Jan Provaznik
Kushal Pandya
Fatih Acet
Filipa Lacerda
Marc Schwede
Andrew Fontaine
Fabio Pitino
Bob Van Landuyt
Achilleas Pipinellis
Lin Jen-Shin
Markus Koller
Marcel Amirault
Sean McGivern
Russell Dickenson
Jiaan
Evan Read