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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'docs-coached-20180613-1' into 'master'	Achilleas Pipinellis	2018-06-14	1	-6/+6
\|\ \| \| \| \| \| \| \| \|	Fixed six broken links in README.md See merge request gitlab-org/gitlab-ce!19797
\| *	fixed university curr anchors	Edwin Torres	2018-06-13	1	-6/+6
\| \|
\| *	fixed university curr anchors	Edwin Torres	2018-06-13	1	-6/+6
\| \|
\| *	fixed university curr anchors	Edwin Torres	2018-06-13	1	-5/+5
\| \|
* \|	Merge branch 'rails5-fix-47805' into 'master'	Rémy Coutable	2018-06-14	2	-1/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	empty: application_setting
* \| \|	Merge branch 'rails5-fix-47835' into 'master'	Rémy Coutable	2018-06-14	2	-1/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails5 fix no implicit conversion of Hash into String Closes #47835 See merge request gitlab-org/gitlab-ce!19792
\| * \| \|	Rails5 fix no implicit conversion of Hash into String. ↵	Jasper Maes	2018-06-13	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::Parameters no longer returns an hash in Rails 5
* \| \| \|	Merge branch 'rails5-fix-47804' into 'master'	Rémy Coutable	2018-06-14	2	-4/+9
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+9
\| \| \|/ \| \|/\|
* \| \|	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