summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CE backport of EE MR approvals E2E testqa-ml-approval-rules-testsMark Lapierre2019-09-047-8/+45
| | | | Includes API methods to add members to projects and groups
* Merge branch 'docs-fzimmer-geo-upgrade-troubleshooting' into 'master'Evan Read2019-09-021-0/+2
|\ | | | | | | | | Added cross reference to the troubleshooting guide See merge request gitlab-org/gitlab-ce!32346
| * Added cross reference to the troubleshooting guideFabian Zimmer2019-09-021-0/+2
|/
* Merge branch 'docs-align-for-single-codebase' into 'master'Evan Read2019-09-023-8/+8
|\ | | | | | | | | Realign 3 docs that diverged between ce/ee See merge request gitlab-org/gitlab-ce!32513
| * Realign 3 docs that diverged between ce/eeMarcel Amirault2019-09-023-8/+8
|/
* Merge branch 'docs-quick-actions-followup' into 'master'Evan Read2019-09-024-88/+65
|\ | | | | | | | | | | | | Adjust table entries in quick actions doc Closes #66256 See merge request gitlab-org/gitlab-ce!32038
| * Update quick actions table and combine with epicsMarcel Amirault2019-09-024-88/+65
|/ | | | Also fix links to renamed headers and moved content
* Merge branch 'docs-shrink-gifs' into 'master'Evan Read2019-09-023-0/+0
|\ | | | | | | | | Crop, trim and compress animated gifs See merge request gitlab-org/gitlab-ce!32511
| * Crop, trim and compress animated gifsMarcel Amirault2019-09-023-0/+0
|/
* Merge branch 'docs/convert-code-quality-gif-to-png' into 'master'Evan Read2019-09-023-3/+2
|\ | | | | | | | | Convert 'code quality' GIF to PNG See merge request gitlab-org/gitlab-ce!32510
| * Convert 'code quality' GIF to PNGRussell Dickenson2019-09-023-3/+2
|/ | | | Image converted to reduce file size.
* Merge branch 'update-workhorse' into 'master'Ash McKenzie2019-09-022-1/+6
|\ | | | | | | | | Update GitLab Workhorse to v8.10.0 See merge request gitlab-org/gitlab-ce!32501
| * Update GitLab Workhorse to v8.10.0Nick Thomas2019-09-012-1/+6
| |
* | Merge branch 'docs/reduce-code-quality-image-size' into 'master'Evan Read2019-09-021-0/+0
|\ \ | | | | | | | | | | | | Replaced image with smaller version See merge request gitlab-org/gitlab-ce!32509
| * | Replaced image with smaller versionRussell Dickenson2019-09-021-0/+0
|/ / | | | | | | | | | | | | The size of this image was reduced to: 1. Reduce its storage size. 2. Optimze for faster loading in browser.
* | Merge branch 'pb-update-shell-version-9-4-2' into 'master'Ash McKenzie2019-09-021-1/+1
|\ \ | | | | | | | | | | | | Update gitlab-shell to v9.4.2 See merge request gitlab-org/gitlab-ce!32505
| * | Update gitlab-shell to v9.4.2pb-update-shell-version-9-4-2Patrick Bajao2019-09-011-1/+1
| |/
* | Merge branch 'sh-fix-ci-lint-500-error' into 'master'Ash McKenzie2019-09-024-1/+26
|\ \ | | | | | | | | | | | | | | | | | | Fix 500 error in CI lint when included templates are an array Closes #66605 See merge request gitlab-org/gitlab-ce!32232
| * | Fix 500 error in CI lint when included templates are an arraysh-fix-ci-lint-500-errorStan Hu2019-08-314-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the following syntax would fail in the linter with an error 500: ``` include: template: - License-Management.gitlab-ci.yml - Dependency-Scanning.gitlab-ci.yml - SAST.gitlab-ci.yml ``` Now the error will call out specifically that the value is not a string. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66605
* | | Merge branch 'docs-size-limit-per-repository' into 'master'Evan Read2019-09-021-6/+13
|\ \ \ | | | | | | | | | | | | | | | | Documentation: Describe where to set "Size limit per repository" for projects and groups See merge request gitlab-org/gitlab-ce!31856
| * | | Project and group "Size limit per repository"docs-size-limit-per-repositoryRene Verschoor2019-08-271-6/+13
| | | |
* | | | Merge branch 'markdownlint-wildcard' into 'master'Evan Read2019-09-023-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change markdownlint wildcard format See merge request gitlab-org/gitlab-ce!32379
| * | | | Change markdownlint wildcard formatMarcel Amirault2019-09-023-3/+3
|/ / / /
* | | | Merge branch 'doc_applications' into 'master'Evan Read2019-09-011-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve document format, putting parameters in a table See merge request gitlab-org/gitlab-ce!31905
| * | | | Improve document format, putting parameters in a tableAlexis Sánchez2019-09-011-1/+3
|/ / / /
* | | | Merge branch 'doc_releases' into 'master'Evan Read2019-09-011-60/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve RAW reading, consistency in api uri See merge request gitlab-org/gitlab-ce!31941
| * | | | Improve RAW reading, consistency in api uriAlexis Sánchez2019-09-011-60/+60
|/ / / /
* | | | Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master'66783-usage-ping-for-slack-integrationsThong Kuah2019-09-0116-267/+259
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move generic k8s services out of GCP namespace See merge request gitlab-org/gitlab-ce!32310
| * | | | Move generic k8s services out of GCP namespace46686-move-k8s-services-out-of-gcp-namespaceTiger2019-08-2816-267/+259
| | | | | | | | | | | | | | | | | | | | | | | | | These services aren't specific to GCP, and will be used for AWS as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/46686
* | | | | Merge branch ↵Nick Thomas2019-09-012-51/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66139-remove-kubernetes_namespace_per_environment-feature-flag' into 'master' Remove :kubernetes_namespace_per_environment feature flag See merge request gitlab-org/gitlab-ce!32140
| * | | | | Remove :kubernetes_namespace_per_environment feature flag66139-remove-kubernetes_namespace_per_environment-feature-flagTiger2019-08-302-51/+19
| | | | | | | | | | | | | | | | | | | | | | | | Feature flag has been defaulting to `true` since 12.2
* | | | | | Merge branch 'remove-unnecessary-freeze-in-app-models' into 'master'Stan Hu2019-09-0130-45/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/models See merge request gitlab-org/gitlab-ce!32499
| * | | | | | Avoid calling freeze on already frozen strings in app/modelsdineshpanda2019-09-0130-45/+45
| | | | | | |
* | | | | | | Merge branch 'remove-unnecessary-freeze-in-app-controllers' into 'master'Stan Hu2019-09-014-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/controllers See merge request gitlab-org/gitlab-ce!32498
| * | | | | | | Avoid calling freeze on already frozen strings in app/controllersdineshpanda2019-09-014-8/+8
| |/ / / / / /
* | | | | | | Merge branch 'improve-chatops-help' into 'master'Nick Thomas2019-09-0111-33/+93
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Improve chatops help output See merge request gitlab-org/gitlab-ce!32208
| * | | | | | Improve chatops help outputimprove-chatops-helpYorick Peterse2019-08-2911-33/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the output produced when running an unknown command, running the "help" command, and when trying to run a command you are not allowed to run. The new help output includes links to the project of the chatops integration, and a link to the chatops documentation.
* | | | | | | Merge branch 'patch-74' into 'master'Stan Hu2019-09-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling of "poiting" See merge request gitlab-org/gitlab-ce!32494
| * | | | | | | Fix spelling of "poiting"John Jago2019-08-311-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'refactor/showStagedIcon' into 'master'Paul Slaughter2019-09-014-7/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor showStagedIcon property's behavior to match its name Closes #66071 See merge request gitlab-org/gitlab-ce!32333
| * | | | | | Refactor showStagedIcon property's behavior to match its nameArun Kumar Mohan2019-08-304-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `showStagedIcon` property was doing the opposite of what its name suggested. It was rendering the staged icon when `showStagedIcon` was `false` and rendering the regular icon when it was `true`.
* | | | | | | Merge branch 'qa-fix-qa-project-show-page-object' into 'master'Stan Hu2019-08-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EE methods to Project Show page object See merge request gitlab-org/gitlab-ce!32489
| * | | | | | | Add EE methods to Project Show page objectJennifer Louie2019-08-311-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'update-jira-ruby-to-1.7.1' into 'master'Lin Jen-Shin2019-08-314-3/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update jira-ruby to 1.7.1 See merge request gitlab-org/gitlab-ce!32436
| * | | | | | | Update jira-ruby to 1.7.1Takuya Noguchi2019-08-304-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | Merge branch 'qa/increase-window-size-during-e2e-tests' into 'master'Tanya Pazitny2019-08-301-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase window size during e2e tests See merge request gitlab-org/gitlab-ce!32471
| * | | | | | | | Increase window size during e2e testsqa/increase-window-size-during-e2e-testsqa-window-size-jlWalmyr Lima2019-08-301-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'remove-ignorable-column-concern' into 'master'Michael Kozono2019-08-3012-111/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependency on IgnorableColumn concern Closes #66746 See merge request gitlab-org/gitlab-ce!32427
| * | | | | | | | | Use self.ignored_columns += instead of =Stan Hu2019-08-307-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to accomodate prepended modules.
| * | | | | | | | | Remove dependency on IgnorableColumn concerndineshpanda2019-08-3012-110/+29
| | | | | | | | | |
View Lorry Controller Status