summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for featuretr-remove-embed-metrics-flagTristan Read2019-08-091-0/+5
|
* Remove gfm_embed_metrics flag from BEsyasonik2019-08-096-57/+2
| | | | | | Removes the feature flag that controls whether metrics dashboard urls unfurl the metrics dashboard charts.
* Remove feature flag from global gon.features objectTristan Read2019-08-091-5/+0
|
* Remove embed metrics feature flagTristan Read2019-08-091-3/+1
|
* Merge branch 'sh-bump-gitlab-workhorse-8.8.0' into 'master'Douglas Barbosa Alexandre2019-08-091-1/+1
|\ | | | | | | | | Bump GitLab Workhorse to v8.8.0 See merge request gitlab-org/gitlab-ce!31676
| * Bump GitLab Workhorse to v8.8.0Stan Hu2019-08-091-1/+1
| | | | | | | | | | | | | | This sanitizes some log messages to be consistent with CE. Full list of changes: https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/CHANGELOG
* | Merge branch ↵Bob Van Landuyt2019-08-093-5/+15
|\ \ | | | | | | | | | | | | | | | | | | '13208-epicissue-has-an-unexpected-default-relative-position-ce' into 'master' [CE] Remove default `relative_position` from `epic_issues` See merge request gitlab-org/gitlab-ce!31514
| * | Remove default relative_position value13208-epicissue-has-an-unexpected-default-relative-position-ceHeinrich Lee Yu2019-08-093-5/+15
| | | | | | | | | | | | | | | This makes `epic_issues` consistent with other tables using our `RelativePositioning` class
* | | Merge branch '59712-resolve-the-search-problem-issue' into 'master'Paul Slaughter2019-08-0910-28/+196
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search loses branch" Closes #59712 See merge request gitlab-org/gitlab-ce!28282
| * | | Add repo-refs control for search pageminghuan lei2019-08-0910-28/+196
|/ / / | | | | | | | | | - only in blobs result
* | | Merge branch 'revert-d61dab91' into 'master'Bob Van Landuyt2019-08-097-93/+29
|\ \ \ | |_|/ |/| | | | | | | | Revert "Merge branch '65152-selective-highlight' into 'master'" See merge request gitlab-org/gitlab-ce!31643
| * | Revert "Merge branch '65152-selective-highlight' into 'master'"revert-d61dab91Patrick Bajao2019-08-097-93/+29
| | | | | | | | | This reverts merge request !31361
* | | Merge branch 'fix-job-log-formatting' into 'master'Filipa Lacerda2019-08-092-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix job log where spans were displayed in block Closes #65686 See merge request gitlab-org/gitlab-ce!31674
| * | | Fix job log where spans were displayed in blockfix-job-log-formattingFabio Pitino2019-08-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary, not ideal, solution but it fixes the main issue that the customer are complaining about, which is that color changes are broken down in several lines which makes the log not readable.
* | | | Merge branch ↵Clement Ho2019-08-093-102/+138
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64730-metrics-dashboard-menu-is-cramped-with-new-features-enabled' into 'master' Improve layout of dropdowns in the metrics dashboard page Closes #64730 See merge request gitlab-org/gitlab-ce!31239
| * | | | Improve layout of dropdowns in metrics pageMiguel Rincon2019-08-093-102/+138
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure layout works on xs and sm screens Add check in case buttons are not present Apply Prettier to file Remove unused class and div, reduce margins
* | | | Merge branch ↵Clement Ho2019-08-094-5/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62137-add-tooltip-to-improve-clarity-of-detached-label-state-in-the-merge-request-pipeline' into 'master' Resolve "Add tooltip to improve clarity of "detached" label/state in the merge request pipeline" Closes #62137 See merge request gitlab-org/gitlab-ce!31626
| * | | | Resolve "Add tooltip to improve clarity of "detached" label/state in the ↵Nick Kipling2019-08-094-5/+14
|/ / / / | | | | | | | | | | | | merge request pipeline"
* | | | Merge branch 'app-differences' into 'master'Rémy Coutable2019-08-091-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport EE changes to Members::BaseService See merge request gitlab-org/gitlab-ce!31581
| * | | | Backport EE changes to Members::BaseServiceapp-differencesYorick Peterse2019-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | EE made some small changes to this class, but these changes were not backported to CE.
* | | | | Merge branch 'lib-differences' into 'master'Rémy Coutable2019-08-092-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Resolve EE differences in the lib/ directory See merge request gitlab-org/gitlab-ce!31582
| * | | | 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