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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Optimize MergeRequestDiff#last_commit_shash-optimize-last-commit-sha	Stan Hu	2019-03-03	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \|	The previous implementation would load all the MergeRequestDiffCommit entries into memory and retrieve the SHA from the latest entry. We can save a bit of query time and memory by retrieving the SHA directly from the first item from the database. This is particularly helpful when there are many merge requests that need this information. Seen while investigating Todo API performance in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25711.
*	Merge branch 'fix-transient-dirty-submit' into 'master'	Kushal Pandya	2019-03-04	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix transient dirty submit spec Closes #58154 See merge request gitlab-org/gitlab-ce!25541
\| *	Fix transient dirty submit	Luke Bennett	2019-03-01	1	-0/+2
\| \|
* \|	Merge branch 'fix-arch-typos' into 'master'	Evan Read	2019-03-04	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Corrected Spelling Typos See merge request gitlab-org/gitlab-ce!25717
\| * \|	Corrected Spelling Typos	Yolanda Feldstein	2019-03-03	1	-2/+2
\| \| \|
* \| \|	Merge branch 'docs-anchors11-misc' into 'master'	Evan Read	2019-03-04	6	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Last batch of misc broken anchors See merge request gitlab-org/gitlab-ce!25707
\| * \| \|	Docs: Last batch of misc broken anchors	Marcel Amirault	2019-03-04	6	-6/+6
\|/ / /
* \| \|	Merge branch '57829-issuable-meta-line-ui-broken-on-mobile' into 'master'	Clement Ho	2019-03-04	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UI for issuable meta info Closes #57829 See merge request gitlab-org/gitlab-ce!25332
\| * \| \|	Fix author layouts in issuable meta line UIs on mobile	Takuya Noguchi	2019-02-18	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \|	Merge branch 'patch-47' into 'master'	Evan Read	2019-03-04	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor grammar fix in docker.md documentation See merge request gitlab-org/gitlab-ce!25640
\| * \| \| \|	Minor grammar fix in docker.md	Hans Cronau	2019-02-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-anchors9-admin' into 'master'	Evan Read	2019-03-04	13	-33/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix all anchors in Admin docs See merge request gitlab-org/gitlab-ce!25641
\| * \| \| \| \|	Docs: Fix all anchors in Admin docs	Marcel Amirault	2019-03-04	13	-33/+27
\|/ / / / /
* \| \| \| \|	Merge branch 'docs-deployment-boards-in-user-group-clusters-docs' into 'master'	Evan Read	2019-03-03	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a wrong link on group-level cluster doc page See merge request gitlab-org/gitlab-ce!25693
\| * \| \| \| \|	Fix a wrong link on group-level cluster doc page	Takuya Noguchi	2019-03-02	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \|	Merge branch '55199-docs' into 'master'	Evan Read	2019-03-03	1	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update error tracking settings docs See merge request gitlab-org/gitlab-ce!24924
\| * \| \| \| \|	Update error tracking settings docs	Reuben Pereira	2019-03-03	1	-2/+6
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-show-pre-receive-error-merge' into 'master'	James Lopez	2019-03-03	3	-3/+7
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show pre-receive error message in merge request widget Closes gitlab-ee#10165 See merge request gitlab-org/gitlab-ce!25708
\| * \| \| \|	Show pre-receive error message in merge request widget	Stan Hu	2019-03-02	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge fails due to a locked file, no feedback was given to the user as to why it failed if the user used the Merge button. However, if the push attempt happened directly in the Web UI, the pre-receive message would be displayed. To be consistent and to make it clear why a merge failed, we now include the pre-receive error message in the merge request widget. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165
* \| \| \| \|	Merge branch 'jc-remove-old-code-path-search-files' into 'master'	Grzegorz Bizon	2019-03-02	3	-25/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing old code path for search_files_by_content See merge request gitlab-org/gitlab-ce!25617
\| * \| \| \| \|	Removing old code path for search_files_by_content	John Cai	2019-03-01	3	-25/+8
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In 11.8, we added a fix for the SearchFilesByContent RPC in gitaly to send back the response in chunks. However, we kept in the old code path for backwards compatibility. Now that the change is fully deployed, we can remove that old codepath.
* \| \| \| \|	Merge branch 'sh-optimize-calendar-activities' into 'master'	Robert Speicher	2019-03-02	3	-3/+37
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate most N+1 queries loading UserController#calendar_activities Closes #58392 See merge request gitlab-org/gitlab-ce!25697
\| * \| \| \|	Eliminate most N+1 queries loading UserController#calendar_activities	Stan Hu	2019-03-01	3	-3/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can reduce a significant number of queries by preloading the associations for events. On GitLab.com, for a date that had 456 events, this brought the load time down from 8.7 to 1.2 s. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58392
* \| \| \| \|	Merge branch 'sh-bump-bootsnap-1.4.1' into 'master'	Robert Speicher	2019-03-01	2	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Bootsnap to 1.4.1 See merge request gitlab-org/gitlab-ce!25701
\| * \| \| \| \|	Bump Bootsnap to 1.4.1	Stan Hu	2019-03-01	2	-3/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1.4.1 contains a number of bug fixes and performance improvements: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md
* \| \| \| \|	Merge branch '57612-github-importer-ignores-milestone-due_date' into 'master'	Stan Hu	2019-03-01	3	-0/+30
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Github importer ignores Milestone due_date" Closes #57612 See merge request gitlab-org/gitlab-ce!25182
\| * \| \| \| \|	Move check for nil due_on into build section of spec	Diana Stanley	2019-02-27	1	-8/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add test for nil due_on value during import	Diana Stanley	2019-02-26	1	-0/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Protect against nil due_on value in imported data	Diana Stanley	2019-02-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Capture due date when importing milestones from Github	Diana Stanley	2019-02-20	3	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/fix-some-links' into 'master'	Marcia Ramos	2019-03-01	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some 404 links into charts project See merge request gitlab-org/gitlab-ce!25589
\| * \| \| \| \| \|	Fix some 404 links into charts project	Evan Read	2019-03-01	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/add-gitlabcom-settings-to-main-page' into 'master'	Marcia Ramos	2019-03-01	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add quick link to GitLab.com settings See merge request gitlab-org/gitlab-ce!25580
\| * \| \| \| \| \|	Add quick link to GitLab.com settings	Evan Read	2019-03-01	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/how-to-point-to-a-confidential-issue' into 'master'	Marcia Ramos	2019-03-01	2	-2/+19
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confidential issue linking guidance See merge request gitlab-org/gitlab-ce!25326
\| * \| \| \| \|	Add confidential issue linking guidance	Evan Read	2019-03-01	2	-2/+19
\|/ / / / /
* \| \| \| \|	Merge branch '9903-geo-selective-sync-by-namespace-is-broken' into 'master'	Stan Hu	2019-03-01	2	-2/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitLab::JsonCache when reading a persisted entry back from the cache See merge request gitlab-org/gitlab-ce!25587
\| * \| \| \| \|	Mark cached value as persisted when is an instance of ActiveRecord::Base	Douglas Barbosa Alexandre	2019-02-28	2	-2/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' ↵	Douglas Barbosa Alexandre	2019-03-01	31	-129/+922
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Hashed Storage rollback mechanism See merge request gitlab-org/gitlab-ce!23955
\| * \| \| \| \| \|	Improve migration/rollback logic for attachments	Gabriel Mazetto	2019-03-01	2	-6/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Migrate sidekiq queue to the new :hashed_storage namespace	Gabriel Mazetto	2019-03-01	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`project_migrate_hashed_storage` is now `hashed_storage:hashed_storage_project_migrate`
\| * \| \| \| \| \|	Extract duplicated code into BaseAttachmentService	Gabriel Mazetto	2019-03-01	5	-97/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exceptions were also simplified from 2 to 1.
\| * \| \| \| \| \|	Extract and simplify more code into BaseRepositoryService`	Gabriel Mazetto	2019-03-01	5	-31/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`try_to_set_repository_read_only!` is now on the Base class. Simplified Exception classes from 2 to 1 with a more descriptive name.
\| * \| \| \| \| \|	Extract common logic to HashedStorage::BaseWorker	Gabriel Mazetto	2019-03-01	4	-55/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New class contains the ExclusiveLease specifics that is shared among both the Migration and Rollback workers.
\| * \| \| \| \| \|	Edge case: upgrade/downgrade when repository doesn't exist	Gabriel Mazetto	2019-03-01	3	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change takes the case where repository doesn't exist on disk and make it ignore but succeed the step, increasing or decreasing the version depending on the operation.
\| * \| \| \| \| \|	Added Rollbacker workers and support on the rake task	Gabriel Mazetto	2019-03-01	16	-25/+292
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rollback is done similar to Migration for the Hashed Storage. It also shares the same ExclusiveLease key to prevent both happening at the same time. All Hashed Storage related workers now share the same queue namespace which allows for assigning dedicated workers easily.
\| * \| \| \| \| \|	Refactor ProjectMigrate and ProjectRollback workers	Gabriel Mazetto	2019-03-01	10	-107/+117
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved to HashedStorage namespace, and added them to the `:hashed_storage` queue namespace
\| * \| \| \| \| \|	Adds Rollback functionality to HashedStorage migration	Gabriel Mazetto	2019-03-01	14	-1/+501
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are adding sidekiq workers and service classes to allow to rollback a hashed storage migration. There are some refactoring involved as well as part of the code can be reused by both the migration and the rollback logic.
\| * \| \| \| \| \|	Rake task for storage rollback	Gabriel Mazetto	2019-03-01	1	-0/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-serverless-updates' into 'master'	Marcia Ramos	2019-03-01	3	-13/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Serverless docs with livestream feedback See merge request gitlab-org/gitlab-ce!25616