delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2019-07-03	44	-925/+543
\|\
\| *	Merge branch '44990-remove-old-i' into 'master'	Nick Thomas	2019-07-03	2	-111/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove old migration specs that violate FactoriesInMigrationSpecs See merge request gitlab-org/gitlab-ce!30280
\| \| *	Remove old migrations and specs44990-remove-old-i	Heinrich Lee Yu	2019-07-03	2	-111/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes old migrations that violate the FactoriesinMigrationSpecs cop
\| * \|	Merge branch 'sh-improve-redis-peek' into 'master'	Sean McGivern	2019-07-03	1	-0/+82
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Redis call details in Peek performance bar See merge request gitlab-org/gitlab-ce!30191
\| \| * \|	Add Redis call details in Peek performance barsh-improve-redis-peek	Stan Hu	2019-07-02	1	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Redis timings appear to be increasing in production, this change makes it easier to see what exactly which queries are being called and where. This is done by prepending modules in peek-redis to store the call details. This commit redact values for all SET commands (e.g. HMSET, GETSET, etc.).
\| * \| \|	Show upcoming status for releases	Jason Goodman	2019-07-03	3	-0/+5
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add released_at field to releases API Add released_at column to releases table Return releases to the API sorted by released_at
\| * \|	Add URL comments to Auto DevOps template	Dylan Griffith	2019-07-03	1	-10/+10
\| \|/ \| \| \| \| \| \| \| \|	This will make it more obvious to anyone looking to customize these files what the source code actually is.
\| *	LC_ALL=C.UTF-8	Pat Myron	2019-07-02	1	-0/+1
\| \|
\| *	Merge branch 'sh-cache-flipper-names-memory-cache' into 'master'	Rémy Coutable	2019-07-02	1	-1/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Cache Flipper persisted names directly to local memory storage See merge request gitlab-org/gitlab-ce!30265
\| \| *	Cache Flipper persisted names directly to local memory storagesh-cache-flipper-names-memory-cache	Stan Hu	2019-07-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that application settings are no longer dominating network traffic, we see that the Feature#persisted_names is using a significant amount of CPU and network bandwidth for Redis. Move this cache into the thread-local memory storage to reduce Redis overhead.
\| * \|	Prefer offline install for yarn	Lukas Eipert	2019-07-02	1	-1/+1
\| \|/
\| *	Merge branch '59177-squash-old-migrations' into 'master'harish-and-cindy-ssl-check-rake-task harish-and-cindy-ldap-sync-rake-tasks	Dmitriy Zaporozhets	2019-07-02	7	-771/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squash old migrations Closes #59177 See merge request gitlab-org/gitlab-ce!30226
\| \| *	Remove migrations from setup_postgresql	Nick Thomas	2019-07-02	1	-14/+0
\| \| \|
\| \| *	Remove background migrations for old schemas	Nick Thomas	2019-07-02	6	-757/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On the assumption that a background migration whose specs need a schema older than 2018 is obsoleted by this migration squash, we can remove both specs and code for those that fail to run in CI as a result of the schema at that date no longer existing. This is true for all but the MigrateStageStatus background migration, which is also used from the MigrateBuildStage background migration.
\| * \|	Merge branch 'sh-add-thread-memory-cache' into 'master'	Rémy Coutable	2019-07-02	1	-0/+15
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a memory cache local to the thread to reduce Redis load Closes #63977 See merge request gitlab-org/gitlab-ce!30233
\| \| * \|	Add a memory cache local to the thread to reduce Redis load	Stan Hu	2019-07-01	1	-0/+15
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loading `ApplicationSetting` from Redis was responsible for at least 50% of the CPU load of the Redis cluster on GitLab.com. Since these values generally don't change very much, we can load this from the database and cache it in memory, skipping Redis altogther. We use `ActiveSupport::Cache::MemoryStore` as a drop-in replacement for `RedisCacheStore` even though we probably don't need synchronized access within `Thread.current`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63977
\| * \|	Merge branch '58808-fix-image-diff-on-text' into 'master'	James Lopez	2019-07-02	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Don't show image diff note on text file See merge request gitlab-org/gitlab-ce!30221
\| \| *	Don't show image diff note on text file58808-fix-image-diff-on-text	Patrick Bajao	2019-07-01	1	-1/+1
\| \| \|
\| * \|	Merge branch 'docs-fix-typo-in-docs' into 'master'	Stan Hu	2019-07-01	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo in lib/gitlab/search/found_blob.rb See merge request gitlab-org/gitlab-ce!30219
\| \| * \|	Fix a typo in lib/gitlab/search/found_blob.rbdocs-fix-typo-in-docs	Rémy Coutable	2019-07-01	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Merge branch '9491-graphql-view-design-board-at-version-ce' into 'master'	Nick Thomas	2019-07-01	1	-0/+32
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for "Show design boards at previous versions in GraphQL" See merge request gitlab-org/gitlab-ce!30151
\| \| * \|	CE backport for changes in EE MR 142929491-graphql-view-design-board-at-version-ce	Luke Duncalfe	2019-06-28	1	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14292 https://gitlab.com/gitlab-org/gitlab-ee/issues/9491
\| * \| \|	Run do_master_restart callback on server start	Jan Provaznik	2019-07-01	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to call master_restart callback on start too - this callback is used for cleaning up prometheus files. It has been added to Omnibus already: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3350 So make sure that Unicorn example configs are up-to-date and that the same callback is called for Puma too.
\| * \| \|	Merge branch 'sh-fix-issue-63910' into 'master'	Sean McGivern	2019-07-01	1	-3/+3
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix attachments using the wrong URLs in e-mails Closes #63910 See merge request gitlab-org/gitlab-ce!30197
\| \| * \|	Fix attachments using the wrong URLs in e-mailssh-fix-issue-63910	Stan Hu	2019-06-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29889, only the project context were set for the Markdown renderer. For a note on an issuable, the group context was set to `nil` because `note.noteable.try(:group)` attempted to get the issuable's group, which doesn't exist. To make group notifications work, now both the project and group context are set. The context gets passed to `RelativeLinkFilter`, which previously assumed that it wasn't possible to have both a group and a project in the Markdown context. However, if a group were defined, it would take precedence, and the URL rendered for uploads would be `/group/-/uploads` instead of `/group/project/uploads/`. This led to 404s in e-mails. However, now that we have both project and group in the context, we render the Markdown giving priority to the project context if is set. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63910
\| * \| \|	Merge branch 'tc-rake-orphan-artifacts' into 'master'	Dmitriy Zaporozhets	2019-07-01	3	-0/+237
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rake task to clean orphan artifact files See merge request gitlab-org/gitlab-ce!29681
\| \| * \| \|	Add rake task to clean orphan artifact filestc-rake-orphan-artifacts	Toon Claes	2019-06-28	3	-0/+237
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the rake task rake gitlab:cleanup:orphan_job_artifact_files. This rake task cleans all orphan job artifact files it can find on disk. It performs a search on the complete folder of all artifacts on disk. Then it filters out all the job artifact ID for which it could not find a record with matching ID in the database. For these, the file is deleted from disk.
\| * \| \| \|	Merge branch 'add-clusters-to-deployment' into 'master'	Lin Jen-Shin	2019-07-01	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clusters association to deployment See merge request gitlab-org/gitlab-ce!29960
\| \| * \| \| \|	Drop fallback to deployment platform	Thong Kuah	2019-06-27	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All deployments should have already their cluster_id filled in on creation. Legacy deployments will not be retried as:- * Ci::Build#retry calls `Ci::RetryBuildService` * Ci::Pipeline#retry calls `Ci::RetryPipelineService` which also calls `Ci::RetryBuildService` * `Ci::RetryBuildService` will clone a build to retry It is also impossibly to backfill Deployment#cluster_id from Project#deployment_platform correctly as clusters could have been deleted, added or altered in the intervening time.
\| \| * \| \| \|	Use deployment's cluster for kubernetes prereq	Thong Kuah	2019-06-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A deployment will have a cluster associated on creation if there is one. Otherwise fallback to deployment_platform for legacy deployments.
\| * \| \| \| \|	Merge branch 'check-min-schema-migrate' into 'master'	Robert Speicher	2019-06-28	2	-0/+25
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we are on a supported version before migrating See merge request gitlab-org/gitlab-ce!29882
\| \| * \| \| \|	Fix extra newline left by conflict resolutioncheck-min-schema-migrate	DJ Mountney	2019-06-28	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into 'check-min-schema-migrate'	DJ Mountney	2019-06-28	26	-53/+159
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/database.rb
\| \| * \| \| \| \|	Update comments and docs around min schema version	DJ Mountney	2019-06-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some spelling Dropped rake task description for a prefix only task Added note on skipping the check to the postgres debugging dev doc
\| \| * \| \| \| \|	Drop the source upgrade change	DJ Mountney	2019-06-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We no longer need to point people away from using db:migrate
\| \| * \| \| \| \|	Add an flag for skipping the schema version check	DJ Mountney	2019-06-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you chose to use the rollback migration feature on your current version for example, you should still have a way to migrate, being that you are still on a supported migration path.
\| \| * \| \| \| \|	Fix db:migrate for fresh installs	DJ Mountney	2019-06-25	1	-1/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Move min schema version check to db:migrate	DJ Mountney	2019-06-25	3	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than have it checked only as part of gitlab:db:configure, we will instead have it as a pre-req for every db:migrate command
\| \| * \| \| \| \|	Check supported version when migrating	DJ Mountney	2019-06-25	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the mininum supported migration version to be the schema version as of 11.11.0, and errors you if that is not detected during gitlab:db:configure
\| * \| \| \| \| \|	Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' ↵	Stan Hu	2019-06-28	1	-11/+3
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use PROCESS_CPUTIME_ID for cpu time metrics Closes #63874 See merge request gitlab-org/gitlab-ce!30166
\| \| * \| \| \| \|	Use PROCESS_CPUTIME_ID for cpu time metrics	Aleksei Lipniagov	2019-06-28	1	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To measure ruby cpu time, we should use PROCESS_CPUTIME_ID instead of THREAD_CPUTIME_ID in our environments.
\| * \| \| \| \| \|	Merge branch 'transaction-metrics' into 'master'	Lin Jen-Shin	2019-06-28	2	-0/+34
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Monitor database transaction activity for Rails See merge request gitlab-org/gitlab-ce!29928
\| \| * \| \| \| \| \|	Adds metrics to measure database transactionstransaction-metrics	Andrew Newdigate	2019-06-28	2	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we don't have good insight into the affect of Rails transaction blocks on the application. If these blocks are held open for extended periods, they can have detrimental effects on the application. This change will allow us to track these transactions, with the aim of reducing their duration.
\| * \| \| \| \| \| \|	Merge branch 'small-s-in-elasticsearch-in-code' into 'master'	Rémy Coutable	2019-06-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in code comments about Elasticsearch See merge request gitlab-org/gitlab-ce!30163
\| \| * \| \| \| \| \| \|	Fix typo in code comments about Elasticsearch	Takuya Noguchi	2019-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
\| * \| \| \| \| \| \| \|	Replace 'JIRA' with 'Jira'	Takuya Noguchi	2019-06-28	1	-5/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
\| * \| \| \| \| \| \|	Merge branch 'set-higher-ttl-for-trace-write' into 'master'	Kamil Trzciński	2019-06-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set higher TTL to write lock for traces See merge request gitlab-org/gitlab-ce!30064
\| \| * \| \| \| \| \| \|	Set higher TTL to write lock for tracesset-higher-ttl-for-trace-write	Shinya Maeda	2019-06-28	1	-1/+1
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set higher TTL is safer option when it comes to long running archive
\| * \| \| \| \| \| \|	Merge branch 'sh-support-subnets-ip-rate-limiter' into 'master'	Thong Kuah	2019-06-28	1	-1/+16
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support CIDR notation in IP rate limiter See merge request gitlab-org/gitlab-ce!30146
\| \| * \| \| \| \| \| \|	Support CIDR notation in IP rate limitersh-support-subnets-ip-rate-limiter	Stan Hu	2019-06-27	1	-1/+16
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will make it possible to whitelist multiple IP addresses (e.g. 192.168.0.1/24).