summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expand textarea for CA cert in cluster formcluster-form-ca-cert-largerThong Kuah2019-09-023-1/+7
| | | | | The current default is too small for a user to see what they have pasted in.
* 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
| | | | | | | |
* | | | | | | | Merge branch '66454-create-feature-flag' into 'master'Mayra Cabrera2019-08-3010-2/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates Feature Flag for job log See merge request gitlab-org/gitlab-ce!32154
| * | | | | | | | Creates Feature Flag for job logFilipa Lacerda2019-08-3010-2/+48
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates frontend code and specs to allow for the new feature flag
* | | | | | | | Merge branch '12055-public-mr-approval-rules-api-ce' into 'master'Robert Speicher2019-08-301-4/+268
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Add documentation about public MR-level API See merge request gitlab-org/gitlab-ce!32133
| * | | | | | | | Doc: Fix order of sections12055-public-mr-approval-rules-api-cePatrick Bajao2019-08-301-81/+81
| | | | | | | | |
| * | | | | | | | Doc: Update POST/PUT endpoints to use *_ids paramsPatrick Bajao2019-08-301-8/+8
| | | | | | | | |
| * | | | | | | | Doc: Fix type of users and groups paramsPatrick Bajao2019-08-301-8/+8
| | | | | | | | |
| * | | | | | | | Doc: Add info about update/delete restrictionPatrick Bajao2019-08-301-1/+7
| | | | | | | | |
| * | | | | | | | Doc: Add documentation about public MR-level APIPatrick Bajao2019-08-301-0/+258
| | | | | | | | |
* | | | | | | | | Merge branch '28643-access-request-emails-limit-to-ten-owners' into 'master'Mayra Cabrera2019-08-3013-43/+258
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Limit access request emails to ten most recently active owners/maintainers" See merge request gitlab-org/gitlab-ce!32141
| * | | | | | | | | Limit access request email to 10 most recently active owners/maintainersManoj MJ2019-08-3013-43/+258
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change limits the number of emails for new access requests notifications to 10 most recently active owners/maintainers
* | | | | | | | | Merge branch 'docs-improve-site-deployment-ux' into 'master'Achilleas Pipinellis2019-08-301-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added expected site deployment wait time See merge request gitlab-org/gitlab-ce!32474
| * | | | | | | | | Added expected site deployment wait timeMatt Penna2019-08-301-4/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch '56295-some-avatars-not-visible-in-commit-trailers' into 'master'Lin Jen-Shin2019-08-305-5/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #56295 - Some Avatars In Commit Trailers Not Visible Closes #56295 See merge request gitlab-org/gitlab-ce!32374
| * | | | | | | | | Fix for #56295, https://gitlab.com/gitlab-org/gitlab-ce/issues/56295.Jesse Hall2019-08-305-5/+75
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | All avatars now visible in commit trailers.
* | | | | | | | | Merge branch '66685-add-production-fixture' into 'master'Stan Hu2019-08-302-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add production fixture to create instance administration project See merge request gitlab-org/gitlab-ce!32467
| * | | | | | | | | Add production fixture to create projectReuben Pereira2019-08-302-0/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since migrations are not run by new instances, add a production fixture that should ensure that the self-monitoring project is created for new instances as well.
* | | | | | | | | Merge branch '12874-extend-group-ip-restriction-to-command-line-ce-docs' ↵Michael Kozono2019-08-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Extend group IP restriction to command line -docs update - backport See merge request gitlab-org/gitlab-ce!32151
| * | | | | | | | | Update docs fileGosia Ksionek2019-08-301-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelod Remove changelog Apply suggestion to doc/user/group/index.md
* | | | | | | | | Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'Grzegorz Bizon2019-08-304-1/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix users cannot access job detail page when deployable does not exist Closes #65216 See merge request gitlab-org/gitlab-ce!32247
| * | | | | | | | | Fix deployable nil exception on job controllerfix-nil-deployable-exception-on-job-controller-showShinya Maeda2019-08-304-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deployable is nil, we gracefully take care of the case.
* | | | | | | | | | Merge branch 'an-fix-histogram-bug' into 'master'12-3-auto-deploy-20190830Kamil Trzciński2019-08-302-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for histogram corruption in Sidekiq See merge request gitlab-org/gitlab-ce!32453
| * | | | | | | | | | Fix for histogram corruption in SidekiqAndrew Newdigate2019-08-302-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in which sidekiq histograms contain invalid labels. See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729 for more details.
* | | | | | | | | | Merge branch 'move-ee-ci-config-to-ce' into 'master'Lin Jen-Shin2019-08-302-0/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use ee/.gitlab/ for CI config files See merge request gitlab-org/gitlab-ce!32351
| * | | | | | | | | | Don't use ee/.gitlab/ for CI config filesmove-ee-ci-config-to-ceYorick Peterse2019-08-282-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are not available in CE, resulting in CI pipeline failures when trying to include these files. Since the job is already configured to only run on EE, we can just include it in both CE and EE.
* | | | | | | | | | | Merge branch '12846-update-security-dashboard-docs' into 'master'Achilleas Pipinellis2019-08-303-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation for security dashboard See merge request gitlab-org/gitlab-ce!32205
| * | | | | | | | | | | Update documentation for security dashboardDave Pisek2019-08-303-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates a screenshot and the description of the documentation of the group security dashboard to it is in sync with the latest version of the dashboard.