summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'harishsr-ldap-groupsync-rake-task-docs' into 'master'Evan Read2019-07-311-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to use the GroupSync rake task See merge request gitlab-org/gitlab-ce!31192
| * | | | | | Document how to use the GroupSync rake taskharishsr-ldap-groupsync-rake-task-docsHarish Ramachandran2019-07-261-0/+25
| | | | | | |
* | | | | | | Merge branch 'parallel-docs-sempahore-example' into 'master'Evan Read2019-07-311-6/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Added Semaphore Test Boosters example to CI YAML `parallel` docs Closes #63509 See merge request gitlab-org/gitlab-ce!31067
| * | | | | | | Documentation: Added Semaphore Test Boosters example to CI YAML `parallel` docsdrew2019-07-311-6/+29
|/ / / / / / /
* | | | | | | Merge branch 'docs/update-dind-title' into 'master'Evan Read2019-07-314-5/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docker title for docker-in-docker workflow See merge request gitlab-org/gitlab-ce!31273
| * | | | | | | Update docker title for docker-in-docker workflowdocs/update-dind-titleSteve Azzopardi2019-07-304-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `docker-in-docker` is a workflow not an specific executor. It uses the [Docker executor](https://docs.gitlab.com/runner/executors/docker.html).
* | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Mike Greiling2019-07-302-20/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.11.1 See merge request gitlab-org/gitlab-ce!31176
| * | | | | | | Update dependency @gitlab/ui to ^5.11.1Lukas Eipert2019-07-302-20/+14
|/ / / / / / /
* | | | | | | Merge branch 'ealcantara-mock-dropdown-show-event' into 'master'Mike Greiling2019-07-301-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit dropdown show event in boards_selector test See merge request gitlab-org/gitlab-ce!31255
| * | | | | | | Emit dropdown show event in boards_selector testealcantara-mock-dropdown-show-eventEnrique Alcantara2019-07-301-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'prepend-ee-helper' into 'master'Robert Speicher2019-07-305-70/+186
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods for injecting EE modules See merge request gitlab-org/gitlab-ce!31055
| * | | | | | | | Added docs for the new EE injection methodsprepend-ee-helperYorick Peterse2019-07-301-21/+25
| | | | | | | | |
| * | | | | | | | Extend cop for verifying injecting of EE modulesYorick Peterse2019-07-302-49/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the InjectEnterpriseEditionModule RuboCop cop so that it verifies the following: 1. The line number the injection occurs on (as before). 2. The method used (e.g. prepend instead of prepend_if_ee). 3. The argument type passed when using the new module injection methods.
| * | | | | | | | Add methods for injecting EE modulesYorick Peterse2019-07-302-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the methods prepend_if_ee, extend_if_ee, and include_if_ee that can be used to inject EE specific modules in EE. These methods are exposed as an initializer that is loaded as soon as possible. For tests that use fast_spec_helper.rb we must load this initializer manually, as the Rails environment is not loaded. This is not the most pretty setup, but unfortunately there is no alternative that we can use.
* | | | | | | | | Update CHANGELOG.md for 12.1.3GitLab Release Tools Bot2019-07-3012-56/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch '10726-exporting-issues-size-is-15mb-but-max-is-20mb-ce' into ↵Mike Greiling2019-07-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [CE] Resolve "Exporting issues size is 15MB but max is 20MB" See merge request gitlab-org/gitlab-ce!31234
| * | | | | | | | | Update documentation on CSV export max file size10726-exporting-issues-size-is-15mb-but-max-is-20mb-ceHeinrich Lee Yu2019-07-301-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-remove-pdfjs-deprecations' into 'master'Mike Greiling2019-07-304-5/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pdf.js deprecation warnings See merge request gitlab-org/gitlab-ce!31253
| * | | | | | | | | Remove pdf.js deprecation warningssh-remove-pdfjs-deprecationsStan Hu2019-07-304-5/+11
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. `page.getViewpoint()` now takes in JSON instead of an integer. 2. Promises are returned from loading and rendering tasks. See https://mozilla.github.io/pdf.js/examples/index.html for more details.
* | | | | | | | | Merge branch 'sh-add-index-extern-uid' into 'master'Douglas Barbosa Alexandre2019-07-303-0/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add partial index on identities table to speed up LDAP lookups Closes #59630 See merge request gitlab-org/gitlab-ce!26710
| * | | | | | | | | Add partial index on identities table to speed up LDAP lookupsStan Hu2019-07-303-0/+25
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For customers with thousands of entries in the table, lookups for an LDAP identity dominated the PostgreSQL statistics because of sequential scans. We can speed this up by adding a partial index with the extern_uid and provider. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59630
* | | | | | | | | Merge branch 'feat/add-support-page-link-in-help-menu' into 'master'Paul Slaughter2019-07-307-6/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feat: add support page link in help menu See merge request gitlab-org/gitlab-ce!30459
| * | | | | | | | | Add support page link in help menuDiego Louzán2019-07-307-6/+46
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new item in help dropdown to show configured support page link
* | | | | | | | | Merge branch 'ce-delete-designs-v2' into 'master'Bob Van Landuyt2019-07-301-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves graphql_helpers See merge request gitlab-org/gitlab-ce!31251
| * | | | | | | | | Improves the graphql_helpers used in GraphQL testsce-delete-designs-v2Alex Kalderimis2019-07-301-2/+6
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the graphql test helpers, failing earlier and more explicitly.
* | | | | | | | | Merge branch 'qa-gke-cluster-10gb' into 'master'Dan Davison2019-07-301-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA spec for Auto DevOps should use 10GB GKE disk See merge request gitlab-org/gitlab-ce!31266
| * | | | | | | | | QA spec for Auto DevOps should 10GB GKE diskqa-gke-cluster-10gbDylan Griffith2019-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was defaulting to 100GB according to https://cloud.google.com/sdk/gcloud/reference/container/clusters/create#--disk-size which is really not ideal since we haven't automated clean up per https://gitlab.com/gitlab-org/gitlab-qa/issues/298
* | | | | | | | | | Merge branch 'sh-fix-gitaly-access-control' into 'master'Douglas Barbosa Alexandre2019-07-303-1/+16
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix exception handling in Gitaly autodetection Closes #65328 See merge request gitlab-org/gitlab-ce!31285
| * | | | | | | | | Fix exception handling in Gitaly autodetectionStan Hu2019-07-303-1/+16
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SELinux, the file cannot be written, and `Errno::EACCES`, not `Errno::ACCESS` is thrown. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65328
* | | | | | | | | Merge branch 'fix-update-templates-rake' into 'master'Jan Provaznik2019-07-304-20/+83
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken update_project_templates rake task See merge request gitlab-org/gitlab-ce!31174
| * | | | | | | | Fix broken update_project_templates rake taskHordur Freyr Yngvason2019-07-304-20/+83
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rake task had been broken for a while. This fixes the breakages, adds a test to help avoid future breakages, and adds a few ergonomic improvements to the task itself.
* | | | | | | | Merge branch 'fix-secpick' into 'master'Stan Hu2019-07-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix secpick pushing to stable branch See merge request gitlab-org/gitlab-ce!31275
| * | | | | | | Fix secpick pushing to stable branchfix-secpickThong Kuah2019-07-301-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'docs-fix-broken-internal-links' into 'master'Marcia Ramos2019-07-303-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken internal links in docs Closes #65318 See merge request gitlab-org/gitlab-ce!31280
| * | | | | | | Fix broken internal links in docsdocs-fix-broken-internal-linksSean McGivern2019-07-303-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'remove-line-profile-from-performance-bar' into 'master'Lin Jen-Shin2019-07-3015-177/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove line profiler from performance bar See merge request gitlab-org/gitlab-ce!31098
| * | | | | | | | Remove line profiler from performance barSean McGivern2019-07-3015-177/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The output isn't great. It can be hard to find hotspots and, even when you do find them, to find why those are hotspots. 2. It uses some jQuery-specific frontend code which we can remove now that we don't have this any more. 3. It's only possible to profile the initial request, not any subsequent AJAX requests.
* | | | | | | | Merge branch 'qa-use-tiller-2.14.2-for-review-apps' into 'master'Lin Jen-Shin2019-07-301-7/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Use the Helm `--atomic` flag when deploying Review Apps See merge request gitlab-org/gitlab-ce!31238
| * | | | | | | Use the --atomic flag when deploying Review Appsqa-use-tiller-2.14.2-for-review-appsRémy Coutable2019-07-301-7/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'qa-create-elasticsearch' into 'master'Mark Lapierre2019-07-308-6/+64
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | CE backport for changes in EE MR 14646 See merge request gitlab-org/gitlab-ce!30932
| * | | | | | Getting on par with EETomislav Nikic2019-07-308-6/+64
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit covers all the files that where changed in the identically named branch on EE that is creating an elasticsearch test case.
* | | | | | Merge branch 'sh-ignore-git-errors-delete-project' into 'master'Ash McKenzie2019-07-303-3/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore Gitaly errors if cache flushing fails on project destruction See merge request gitlab-org/gitlab-ce!31164
| * | | | | | Ignore Gitaly errors if cache flushing fails on project destructionStan Hu2019-07-293-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should just ignore these errors and move along with the deletion since the repositories are going to be trashed anyway. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31164
* | | | | | | Merge branch 'Jenkins_Integration_Mktg_Docs_Page_Update_20190729' into 'master'Evan Read2019-07-301-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Update jenkins.md - add CTA to about.gitlab page See merge request gitlab-org/gitlab-ce!31259
| * | | | | | Update jenkins.md - add CTA to about.gitlab pageAgnes Oetama2019-07-301-0/+3
|/ / / / / /
* | | | | | Merge branch 'docs-ci-examples-fix-typo' into 'master'Evan Read2019-07-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation: fix a typo in ci/examples See merge request gitlab-org/gitlab-ce!31250
| * | | | | | Doc: ci: examples: fix typo EnvoyRomain Aviolat2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a typo in the ci/examples documentation
* | | | | | | Merge branch 'docs-ssot-gitlab-basics-1' into 'master'Evan Read2019-07-3011-310/+396
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise /gitlab-basics to SSoT Docs standards Closes #65153 See merge request gitlab-org/gitlab-ce!31172
| * | | | | | First pass to bring /gitlab-basics to SSoT standardsMarcel Amirault2019-07-3011-310/+396
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes duplicated information, and combines sections and files together when they are duplicated or highly related. Also adds intros to all pages and sections missing intros, and troubleshooting sections to pages that may need them in the future. Links more to other docs, and clarifies language when abosolutely necessary, and adds angle brackets to sample parameters.
* | | | | | Merge branch 'qa-mattermost-spec-retry' into 'master'Sanad Liaquat2019-07-301-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add retry on exception to mattermost login spec See merge request gitlab-org/gitlab-ce!31243