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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Flush cache for project list47851-bump-cache-for-old-master-permission	Mark Chao	2018-06-14	1	-1/+1
\| \| \| \|	For master->maintainer permission rename
*	Merge branch 'winh-new-branch-url-encode' into 'master'	Mike Greiling	2018-06-13	3	-16/+107
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix branch name encoding for dropdown on issue page Closes #47472 See merge request gitlab-org/gitlab-ce!19634
\| *	Fix branch name encoding for dropdown on issue page	Winnie Hellmann	2018-06-13	3	-16/+107
\|/
*	Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'	Annabel Gray	2018-06-13	8	-23/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove the btn-xs class from the stylesheets Closes #46743 See merge request gitlab-org/gitlab-ce!19719
\| *	Remove the btn-xs class from the stylesheets	Jose	2018-06-13	8	-23/+5
\| \|
* \|	Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'	Annabel Gray	2018-06-13	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Merge request diff loading icon not visible" Closes #47830 and #47849 See merge request gitlab-org/gitlab-ce!19758
\| * \|	Fix loading icon for mr tabs	Clement Ho	2018-06-13	1	-1/+1
\| \| \|
* \| \|	Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'	Clement Ho	2018-06-13	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove card class from the git-empty containers Closes #47847 See merge request gitlab-org/gitlab-ce!19785
\| * \| \|	Remove card class from the git-empty containers	Jose	2018-06-13	1	-4/+4
\| \|/ /
* \| \|	Merge branch 'unify-parallel_importer' into 'master'	Stan Hu	2018-06-13	1	-0/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring changes from EE for parallel_importer.rb See merge request gitlab-org/gitlab-ce!19779
\| * \| \|	Bring changes from EE for parallel_importer.rb	Lin Jen-Shin	2018-06-14	1	-0/+9
\| \| \| \|
* \| \| \|	Merge branch 'rosulk-patch-12' into 'master'	Clement Ho	2018-06-13	2	-5/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flex board columns See merge request gitlab-org/gitlab-ce!19250
\| * \| \| \|	Flex board columns	Paul Slaughter	2018-06-13	2	-5/+11
\|/ / / /
* \| \| \|	Merge branch 'bvl-missing-message-on-access-denied' into 'master'	Robert Speicher	2018-06-13	4	-3/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Merge branch 'mk/rake-task-verify-remote-files' into 'master'	Stan Hu	2018-06-13	10	-41/+147
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks Closes #47139 See merge request gitlab-org/gitlab-ce!19501
\| * \| \| \|	Add support for verifying remote uploads, artifacts, and LFS objects in ↵	Michael Kozono	2018-06-13	10	-41/+147
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	check rake tasks
* \| \| \|	Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'	Rémy Coutable	2018-06-13	1	-13/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QA: Only clear the sessions if there's no error with a block Closes gitlab-qa#197 See merge request gitlab-org/gitlab-ce!19751
\| * \| \| \|	Only clear the sessions if block_given? and no error	Lin Jen-Shin	2018-06-13	1	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because otherwise capybara-screenshot/rspec can't take the screenshots for us. If we got an error, we don't want to continue anyway?
* \| \| \| \|	Merge branch 'ab-document-migration-needs-changelog' into 'master'	Yorick Peterse	2018-06-13	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Database migrations should have a changelog entry. See merge request gitlab-org/gitlab-ce!19703
\| * \| \| \| \|	Database migrations should have a changelog entry.	Andreas Brandl	2018-06-13	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'gl-remove-window-scope' into 'master'	Phil Hughes	2018-06-13	6	-56/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes merge conflicts vue code from globalnamespace See merge request gitlab-org/gitlab-ce!19750
\| * \ \ \ \	Merge branch 'master' into gl-remove-window-scope	Filipa Lacerda	2018-06-13	261	-1105/+1399
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Add documentation: Overview of Frontend Testing Resolve "Add `/confidential` quick action for issues" i18n: externalize strings from 'app/views/award_emoji' Fix broken tests due to bad conflict resolution Updates eslint rules Documentation does not need an exception to be picked Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue [Rails5] Fix `storage_counter` helper Adjust SQL and transaction Prometheus buckets Updates eslint vue plugin version
\| * \| \| \| \| \|	Removes merge conflicts vue code from globalnamespace	Filipa Lacerda	2018-06-13	6	-57/+42
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-ux-handbook-link' into 'master'	Stan Hu	2018-06-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UX handbook link in contribution guide See merge request gitlab-org/gitlab-ce!19738
\| * \| \| \| \| \|	Fix UX handbook link in contribution guide	Andreas Kämmerle	2018-06-13	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-empty-batch-no-rpc' into 'master'	Rémy Coutable	2018-06-13	2	-0/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+12
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \|	Merge branch 'fj-use-gitaly-0-105-1' into 'master'	Douwe Maan	2018-06-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.105.1 See merge request gitlab-org/gitlab-ce!19739
\| * \| \| \| \| \| \|	Use Gitaly 0.105.1	Francisco Javier López	2018-06-13	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'	Phil Hughes	2018-06-13	1	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Board list creation is broken" Closes #47823 See merge request gitlab-org/gitlab-ce!19746
\| * \| \| \| \| \|	Add missing `entityType`	Kushal Pandya	2018-06-13	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-coached-20180610-1' into 'master'	Achilleas Pipinellis	2018-06-13	1	-31/+116
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resolving MR 19611-fix/enhance start-using-git doc See merge request gitlab-org/gitlab-ce!19619
\| * \| \| \| \| \| \|	resolving MR 19611-fix/enhance start-using-git doc	Edwin Torres	2018-06-13	1	-31/+116
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '47501-link-scroll' into 'master'	Clement Ho	2018-06-13	5	-26/+23
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Scrolling tabs are broken on profile, activity, and projects" Closes #47501 See merge request gitlab-org/gitlab-ce!19606
\| * \| \| \| \| \|	Resolve "Scrolling tabs are broken on profile, activity, and projects"	Simon Knox	2018-06-13	5	-26/+23
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'doc-add-overview-of-frontend-testing' into 'master'	Tim Zallmann	2018-06-13	1	-2/+134
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation: Overview of Frontend Testing Closes #45732 See merge request gitlab-org/gitlab-ce!18571
\| * \| \| \| \| \|	Add documentation: Overview of Frontend Testing	André Luís	2018-06-13	1	-2/+134
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sql-buckets' into 'master'	Stan Hu	2018-06-13	3	-2/+7
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust SQL and transaction Prometheus buckets See merge request gitlab-org/gitlab-ce!19650
\| * \| \| \| \|	Adjust SQL and transaction Prometheus bucketssql-buckets	Yorick Peterse	2018-06-11	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to better calculate Apdex scores, instead of having to use the 0.1 and 1.0 buckets.
* \| \| \| \| \|	Merge branch '47145-quick-actions-confidential' into 'master'	Rémy Coutable	2018-06-13	5	-0/+71
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add `/confidential` quick action for issues" Closes #47145 See merge request gitlab-org/gitlab-ce!19615
\| * \| \| \| \|	Resolve "Add `/confidential` quick action for issues"	Jan	2018-06-13	5	-0/+71
\|/ / / / /
* \| \| \| \|	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).
* \| \| \| \| \|	Merge branch 'add-documentation-to-freeze' into 'master'	Marin Jankovski	2018-06-13	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation does not need an exception to be picked See merge request gitlab-org/gitlab-ce!19741
\| * \| \| \| \| \|	Documentation does not need an exception to be picked	Sean McGivern	2018-06-13	1	-0/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fl-eslint-vue-house-keeping' into 'master'	Tim Zallmann	2018-06-13	248	-1087/+1165
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates eslint vue plugin version See merge request gitlab-org/gitlab-ce!19648
\| * \| \| \| \| \|	Fix broken tests due to bad conflict resolution	Filipa Lacerda	2018-06-13	3	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Updates eslint rules	Filipa Lacerda	2018-06-13	6	-23/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into fl-eslint-vue-house-keeping	Filipa Lacerda	2018-06-13	77	-142/+1553
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (27 commits) Resolve "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used"" Resolve "Provide ability to retrieve `visibility` level via Snippets API" Resolve "Quick actions are case sensitive" Image Diff Viewing + Download Diff Viewing Link to release post for group issue board docs moved strings into constants file Typo fix fixed condition check Loosen the 'newly created MR' matcher Ensure we look into the correct setion only when expanding a settings' section Rails5 fix expected `issuable.reload.updated_at` to have changed [Rails5] Pass class references instead of strings to middleware builder Sidebar Milestone - Fix wrong URL when selecting a parent group milestone Fix Banzai reference for milestones belonging to parent groups apply feedback fixed eslint added specs for is-active class added spec for openPendingTab in component more karma fixes karma updates Override exclusive_lease_key method in RecordsUpload ...