summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Backport EE changes to ProjectSearchResultslib-differencesYorick Peterse2019-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE made some changes to the project_ids_relation method, but these were not backported to CE.
| * | | | | | Backport EE changes to the project import APIYorick Peterse2019-08-081-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added a single line to this file that can easily be backported to CE, but it appears this was overlooked. The method called is a noop in CE, so no additional changes are necessary.
* | | | | | Merge branch 'visual-review-tools-constant-storage-keys' into 'master'Paul Slaughter2019-08-099-16/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual review app gitlab storage keys See merge request gitlab-org/gitlab-ce!31427
| * | | | | | Visual review app gitlab storage keysvisual-review-tools-constant-storage-keysshampton2019-08-029-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move away from using generic LocalStorage and SessionStorage keys which could be used by the customer for their own application.
* | | | | | | Merge branch '63671-remove-extra-padding-from-the-disabled-comment-area' ↵Paul Slaughter2019-08-092-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Remove extra padding from the disabled comment area" Closes #63671 See merge request gitlab-org/gitlab-ce!31603
| * | | | | | | Shrink size of please register or sign in boxMarcel van Remmerden2019-08-092-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'sh-fix-sidekiq-scheduling-latency' into 'master'Thong Kuah2019-08-092-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sidekiq scheduling_latency_s Closes #65748 See merge request gitlab-org/gitlab-ce!31650
| * | | | | | | Fix Sidekiq scheduling_latency_ssh-fix-sidekiq-scheduling-latencyStan Hu2019-08-082-3/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This number was reporting a negative number because `current_time` was a monotonic counter, not an absolute time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65748
* | | | | | | Merge branch 'revert-2e7f4bbb' into 'master'Bob Van Landuyt2019-08-097-51/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert milestone filter behavior for "any" (CE-backport) See merge request gitlab-org/gitlab-ce!31583
| * | | | | | | Revert "Merge branch ↵Winnie Hellmann2019-08-097-51/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '4221-board-milestone-should-persist-any-none-properly-ce' into 'master'" This reverts merge request !30613
* | | | | | | Merge branch 'sh-add-gitaly-and-rugged-data-sidekiq' into 'master'Sean McGivern2019-08-099-17/+87
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly and Rugged call timing in Sidekiq logs See merge request gitlab-org/gitlab-ce!31651
| * | | | | | | Add Gitaly and Rugged call timing in Sidekiq logsStan Hu2019-08-099-17/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help identify Sidekiq jobs that invoke excessive number of filesystem access. The timing data is stored in `RequestStore`, but this is only active within the middleware and is not directly accessible to the Sidekiq logger. However, it is possible for the middleware to modify the job hash to pass this data along to the logger.
* | | | | | | | Merge branch 'tq/fix/65204-fork-avatar-misalign' into 'master'Kushal Pandya2019-08-091-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Misalignment of Avatar when forking project" Closes #65204 See merge request gitlab-org/gitlab-ce!31436
| * | | | | | | resolve review comments:Tom Quirk2019-08-091-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use .mx-auto for avatar - remove parent div for group_icon
* | | | | | | Merge branch '39217-remove-kubernetes-service-integration' into 'master'James Lopez2019-08-0915-402/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove KubernetesService integration See merge request gitlab-org/gitlab-ce!31365
| * | | | | | | Final removal of KubernetesService39217-remove-kubernetes-service-integrationTiger2019-08-0815-402/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating new records has been disabled, and all existing records been migrated to clusters as of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28534
* | | | | | | | Merge branch '65700-document-max-replication-slots-pg-ha' into 'master'Achilleas Pipinellis2019-08-092-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add max_replication_slots to PG HA documentation Closes #65700 See merge request gitlab-org/gitlab-ce!31534
| * | | | | | | | Add max_replication_slots to PG HA documentation65700-document-max-replication-slots-pg-haRobert Marshall2019-08-062-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - PostgreSQL high availability documentation does not mention `max_replication_slots` which must be set to work properly as the default value is zero. Resolves: https://gitlab.com/gitlab-org/gitlab-ce/issues/65700 Related: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4576 Related: https://gitlab.com/gitlab-org/distribution/team-tasks/issues/438 Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
* | | | | | | | | Merge branch 'docs-adds-more-database-guidelines' into 'master'Achilleas Pipinellis2019-08-091-3/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add database guidelines for background migrations and update queries See merge request gitlab-org/gitlab-ce!31190
| * | | | | | | | | Adds DB guidelines regarding execution timingMayra Cabrera2019-08-091-3/+25
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a new guideline regarding the file location of background migrations - Add a new section about execution timing guidelines for all different kinds of migrations
* | | | | | | | | Merge branch '60157-cloneauth-docs' into 'master'Achilleas Pipinellis2019-08-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clarify without authentication Closes #60157 See merge request gitlab-org/gitlab-ce!31604
| * | | | | | | | | Clarify without authenticationStefan Schmalzhaf2019-08-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Paul Slaughter2019-08-092-15/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-9510-new-metric-button-should-not-be-duplicated-on-custom-metrics-page' into 'master' CE: Remove duplicated 'New metric' button in Prometheus configuration See merge request gitlab-org/gitlab-ce!31394
| * | | | | | | | | | Remove duplicate button to add new metricsMiguel Rincon2019-08-092-15/+5
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove "new metrics" duplicated button and replace with a message - Replace css with utility classes in the prometheus metrics view - Remove unused css
* | | | | | | | | | Merge branch 'speed-up-labels-api' into 'master'Rémy Coutable2019-08-0914-87/+160
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove label issue and MR counts from default API responses See merge request gitlab-org/gitlab-ce!31543
| * | | | | | | | | | Remove label issue and MR counts from default API responsesspeed-up-labels-apiSean McGivern2019-08-0814-87/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These counts significantly increase the load time for these requests. Users can now opt in to receiving the counts by setting `with_counts=true` in requests. This is a breaking change, but hopefully a fairly minor one.
* | | | | | | | | | | Merge branch 'docs/fix-email-hostname-instructions' into 'master'Evan Read2019-08-091-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected custom email hostname instructions See merge request gitlab-org/gitlab-ce!31646
| * | | | | | | | | | Corrected custom email hostname instructionsRussell Dickenson2019-08-091-4/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-legal-touchup' into 'master'Evan Read2019-08-092-23/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add contribution section to contribution agreements See merge request gitlab-org/gitlab-ce!30510
| * | | | | | | | | | Add contribution section to contribution agreementsMarcel Amirault2019-08-092-23/+29
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '62759-gitlab-backup-doc' into 'master'Evan Read2019-08-093-15/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `gitlab-rake` with `gitlab-backup` command for backup and restore tasks See merge request gitlab-org/gitlab-ce!31555
| * | | | | | | | | | Change gitlab-rake to gitlab-backup for backup and restore tasks62759-gitlab-backup-docHossein Pursultani2019-08-073-15/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/52494-add-namespace-per-environment-milestone-note' into ↵Evan Read2019-08-091-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add namespace default note to cluster docs Closes #65751 See merge request gitlab-org/gitlab-ce!31596
| * | | | | | | | | | | Add namespace default note to cluster docsTiger Watson2019-08-091-1/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'migration-style-guide-docs' into 'master'Evan Read2019-08-091-8/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Migration Style Guide. Remove MySQL mentions See merge request gitlab-org/gitlab-ce!31531
| * | | | | | | | | | Update Migration Style Guidemigration-style-guide-docsValery Sizov2019-08-071-8/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'add-release-to-github-importer' into 'master'Mayra Cabrera2019-08-093-2/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a field for released_at to GH importer See merge request gitlab-org/gitlab-ce!31496
| * | | | | | | | | | Add a field for released_at to GH importerCindy Pallares 🦉2019-08-093-2/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-sast-analyzers' into 'master'Evan Read2019-08-081-13/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting in alphabetical order, adding strings to be used with analyzers See merge request gitlab-org/gitlab-ce!31510
| * | | | | | | | | | Sorting in alphabetical order, adding strings to be used with analyzersJulius Kvedaras2019-08-081-13/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-debug-atanayno' into 'master'Evan Read2019-08-082-0/+253
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring k8s cheat sheet to docs See merge request gitlab-org/gitlab-ce!31319
| * | | | | | | | | | Bring k8s cheat sheet to docsMarcel Amirault2019-08-082-0/+253
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring the support team k8s cheat sheet into the main documentation
* | | | | | | | | | Merge branch 'rails-template-update' into 'master'redis-migrationThong Kuah2019-08-082-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails project template See merge request gitlab-org/gitlab-ce!31310
| * | | | | | | | | | Update rails project templateDaniel Gruesso2019-08-082-0/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'emilie-master-patch-10465' into 'master'Sid Sijbrandij2019-08-081-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to memory team page from the installation requirements See merge request gitlab-org/gitlab-ce!31637
| * | | | | | | | | | Add link to memory team page from the installation requirementsEmilie Schario2019-08-081-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-rename-githost-to-gitjson' into 'master'Mayra Cabrera2019-08-086-8/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename githost.log -> git_json.log See merge request gitlab-org/gitlab-ce!31634
| * | | | | | | | | | Rename githost.log -> git_json.logStan Hu2019-08-086-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The githost.log name was often confused with GitHost.io. Rename this to git_json.log to make it clear it's coming from Git and that it's JSON data.
* | | | | | | | | | | Merge branch 'jejacks0n-remove-bad-spec' into 'master'Tim Zallmann2019-08-081-7/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up an incomplete thought as a spec See merge request gitlab-org/gitlab-ce!31541
| * | | | | | | | | | | Clean up an incomplete thought as a specjejacks0n-remove-bad-specjejacks0n2019-08-061-7/+0
| | |/ / / / / / / / / | |/| | | | | | | | |