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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rails5-fix-47805' into 'master'	Rémy Coutable	2018-06-14	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 ActionController::ParameterMissing: param is missing or the value is… Closes #47805 See merge request gitlab-org/gitlab-ce!19763
\| *	Rails5 ActionController::ParameterMissing: param is missing or the value is ↵	Jasper Maes	2018-06-13	1	-1/+1
\| \| \| \| \| \| \| \|	empty: application_setting
* \|	Merge branch 'rails5-fix-47804' into 'master'	Rémy Coutable	2018-06-14	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix stack level too deep Closes #47804 See merge request gitlab-org/gitlab-ce!19762
\| * \|	Rails5 fix stack level too deep	Jasper Maes	2018-06-13	1	-4/+4
\| \|/
* \|	Fix branch name encoding for dropdown on issue page	Winnie Hellmann	2018-06-13	1	-0/+67
\| \|
* \|	Merge branch 'bvl-missing-message-on-access-denied' into 'master'	Robert Speicher	2018-06-13	2	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render access denied without message Closes #47844 See merge request gitlab-org/gitlab-ce!19755
\| * \|	Render access denied without message	Bob Van Landuyt	2018-06-13	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `errors/access_denied` page should not fail to render when no message is provided. When accessing something as a sessionless user, we should also display the terms message if possible.
* \| \|	Add support for verifying remote uploads, artifacts, and LFS objects in ↵	Michael Kozono	2018-06-13	3	-22/+59
\| \|/ \|/\| \| \| \| \|	check rake tasks
* \|	Merge branch 'zj-empty-batch-no-rpc' into 'master'	Rémy Coutable	2018-06-13	1	-0/+10
\|\ \ \| \|/ \|/\| \| \| \| \|	ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
\| *	ListCommitByOid isn't called with an empty batch	Zeger-Jan van de Weg	2018-06-13	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Batching commits for performance improvements, might lead to empty batches being used. This isn't the case yet, but to guard against this in future cases, a guard clause is added.
* \|	Resolve "Add `/confidential` quick action for issues"	Jan	2018-06-13	2	-0/+54
\| \|
* \|	Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'	Rémy Coutable	2018-06-13	1	-10/+14
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails" Closes #47375 See merge request gitlab-org/gitlab-ce!19725
\| *	[Rails5] Fix `storage_counter` helper	blackst0ne	2018-06-13	1	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since rails 5 beta 2 support of petabytes and exabytes were added to the `number_to_human*` methods. See https://github.com/rails/rails/pull/22759 So for rails5 the comma separator gets shown for big numbers (EBs).
* \|	Resolve "Provide ability to retrieve `visibility` level via Snippets API"	Jan	2018-06-13	2	-0/+4
\| \|
* \|	Resolve "Quick actions are case sensitive"	Jan	2018-06-13	1	-0/+16
\| \|
* \|	Merge branch 'ide-commit-section-file-active-indicator' into 'master'	Filipa Lacerda	2018-06-13	3	-1/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add active class to active file in IDE commit panel Closes #46051 See merge request gitlab-org/gitlab-ce!19646
\| * \|	moved strings into constants fileide-commit-section-file-active-indicator	Phil Hughes	2018-06-13	1	-0/+1
\| \| \|
\| * \|	fixed eslint	Phil Hughes	2018-06-12	1	-3/+5
\| \| \|
\| * \|	added specs for is-active class	Phil Hughes	2018-06-12	2	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \|	added spec for openPendingTab in component
\| * \|	karma updates	Phil Hughes	2018-06-12	3	-0/+3
\| \| \|
* \| \|	Merge branch '47735-milestone-regression' into 'master'	Phil Hughes	2018-06-13	3	-2/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721
\| * \| \|	Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regression	Mario de la Ossa	2018-06-12	2	-1/+27
\| \| \| \|
\| * \| \|	Fix Banzai reference for milestones belonging to parent groups	Mario de la Ossa	2018-06-12	1	-1/+9
\| \| \|/ \| \|/\|
* \| \|	Merge branch ↵	Sean McGivern	2018-06-13	2	-4/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders' into 'master' Resolve "Upload migration lease key is incorrect for non-mounted uploaders" Closes #47513 See merge request gitlab-org/gitlab-ce!19600
\| * \| \|	Use upload ID instead of model ID in lease key	Jan Provaznik	2018-06-12	2	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For FileUploaders it's possible that a model has many uploads and if lease key is created only from model id, it causes that the model's uploads can not be migrated in parallel because the exclusive lease key would be same for all uploads of the model.
* \| \| \|	Image Diff Viewing + Download Diff Viewing	Tim Zallmann	2018-06-13	8	-5/+323
\| \| \| \|
* \| \| \|	Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' ↵	Sean McGivern	2018-06-13	3	-17/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration" Closes #47408 See merge request gitlab-org/gitlab-ce!19547
\| * \| \| \|	apply feedback47408-migrateuploadsworker-is-doing-n-1-queries-on-migration	Micaël Bergeron	2018-06-12	1	-20/+14
\| \| \| \| \|
\| * \| \| \|	apply feedback	Micaël Bergeron	2018-06-08	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	fix the failing spec	Micaël Bergeron	2018-06-07	2	-4/+4
\| \| \| \| \|
\| * \| \| \|	shave off another 20% query	Micaël Bergeron	2018-06-07	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	shave off 30% of the query count	Micaël Bergeron	2018-06-06	1	-9/+41
\| \| \| \| \|
* \| \| \| \|	Restoring user v3 endpoint	Francisco Javier López	2018-06-13	2	-38/+45
\| \| \| \| \|
* \| \| \| \|	Merge branch '42342-teams-pipeline-notifications' into 'master'	Douwe Maan	2018-06-13	2	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Microsoft Teams notification for pipelines do not work" Closes #42342 See merge request gitlab-org/gitlab-ce!19632
\| * \| \| \| \|	Fixes Microsoft Teams notifications for pipeline events	Jeff Brown	2018-06-12	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #42342
* \| \| \| \| \|	Merge branch 'commits_api_with_stats' into 'master'	Rémy Coutable	2018-06-13	3	-2/+37
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added with_stats option to GET /projects/:id/repository/commits (API) See merge request gitlab-org/gitlab-ce!19484
\| * \| \| \| \|	Added with_statsoption for GET /projects/:id/repository/commits	Leonid Batizhevskii	2018-06-12	3	-2/+37
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'ide-job-loading-empty-state' into 'master'	Filipa Lacerda	2018-06-12	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
\| * \| \| \| \|	Fixed IDE jobs empty state showing when loadingide-job-loading-empty-state	Phil Hughes	2018-06-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47766
* \| \| \| \| \|	Merge branch 'pr-importer-io-extra-error-handling' into 'master'	Nick Thomas	2018-06-12	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
\| * \| \| \| \| \|	Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handling	Yorick Peterse	2018-06-12	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* \| \| \| \| \| \|	Merge branch 'gitaly-disk-access-3' into 'master'	Douwe Maan	2018-06-12	23	-125/+214
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
\| * \| \| \| \| \| \|	Find and mark more Git disk access locations, part 2	Jacob Vosmaer	2018-06-12	23	-125/+214
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	mergeError message has been binded using v-html directive	Murat Dogan	2018-06-12	1	-4/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'replace-dots-with-ellipsis' into 'master'	Annabel Gray	2018-06-12	3	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace ... with ellipsis in placeholders See merge request gitlab-org/gitlab-ce!19627
\| * \| \| \| \| \| \| \|	Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsis	Andreas Kämmerle	2018-06-11	3	-4/+4
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter	Francisco Javier López	2018-06-12	1	-0/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'expose-ci-url' into 'master'	Grzegorz Bizon \| off until 20th June	2018-06-12	2	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CI_{PIPELINE,JOB}_URL See merge request gitlab-org/gitlab-ce!19618
\| * \| \| \| \| \| \| \|	Add CI_{PIPELINE,JOB}_URLexpose-ci-url	Kamil Trzciński	2018-06-12	2	-1/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Resolve "[Rails5] `ActionView::MissingTemplate` in ↵	blackst0ne	2018-06-12	1	-8/+12
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/features/projects/wiki/user_views_wiki_page_spec.rb"