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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move the trigger-build script into one location to serve both omnibus and ↵refactor-trigger-build-script	Marin Jankovski	2018-06-14	5	-172/+184
\| \| \| \|	cloud-native triggers.
*	Merge branch 'fix-flakey-user-comment-on-issue' into 'master'	Sean McGivern	2018-06-14	1	-2/+5
\|\ \| \| \| \| \| \| \| \|	Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786
\| *	Fix flakey user comment on issue test race condition	Eric Eastwood	2018-06-14	1	-2/+5
\| \|
* \|	Merge branch 'author-doc-fix' into 'master'	Achilleas Pipinellis	2018-06-14	2	-30/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fields for author & assignee in MR API docs Closes #42445 See merge request gitlab-org/gitlab-ce!19798
\| * \|	Fix fields for author & assignee in MR API docs.	gfyoung	2018-06-13	2	-30/+37
\| \|/ \| \| \| \| \| \|	Closes #42445.
* \|	Merge branch 'cache-doc-fix' into 'master'	Achilleas Pipinellis	2018-06-14	2	-10/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove incorrect CI doc re: PowerShell Closes #40164 See merge request gitlab-org/gitlab-ce!19622
\| * \|	Remove incorrect CI doc re: PowerShell	gfyoung	2018-06-13	2	-10/+5
\| \|/ \| \| \| \| \| \|	Closes #40164.
* \|	Merge branch 'unify-simple_executor' into 'master'	Douwe Maan	2018-06-14	1	-5/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bring changes from EE for lib/system_check/simple_executor.rb See merge request gitlab-org/gitlab-ce!19782
\| * \|	Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executor	Lin Jen-Shin	2018-06-14	1	-5/+25
\| \| \|
* \| \|	Merge branch ↵	Sean McGivern	2018-06-14	3	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774
\| * \| \|	Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-lists	Rubén Dávila	2018-06-13	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The partial using this cache key was showing stale information due to the cache not being invalidated.
* \| \| \|	Merge branch 'assignee-lists-tiers-docs' into 'master'	Sean McGivern	2018-06-14	1	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add assignee lists to tiers table in docs See merge request gitlab-org/gitlab-ce!19756
\| * \| \| \|	Add assignee lists to tiers table in docsassignee-lists-tiers-docs	Victor Wu	2018-06-13	1	-6/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jprovazn-rails5-shoulda' into 'master'	Rémy Coutable	2018-06-14	1	-0/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix shoulda-matchers in Rails 5 Closes #47639 See merge request gitlab-org/gitlab-ce!19749
\| * \| \| \| \|	Fix shoulda-matchers in Rails 5jprovazn-rails5-shoulda	Jan Provaznik	2018-06-13	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
* \| \| \| \| \|	Merge branch 'ide-pipeline-error-wrap' into 'master'	Filipa Lacerda	2018-06-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap YAML error in Web IDE pipelines panel Closes #47755 See merge request gitlab-org/gitlab-ce!19736
\| * \| \| \| \| \|	Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrap	Phil Hughes	2018-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #47755
* \| \| \| \| \| \|	Merge branch 'bw-enable-commonmark' into 'master'	Sean McGivern	2018-06-14	14	-86/+195
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enable CommonMark as the default See merge request gitlab-org/gitlab-ce!19331
\| * \| \| \| \| \| \|	enable CommonMark as the default	Brett Walker	2018-06-14	14	-86/+195
\|/ / / / / / /
* \| \| \| \| \| \|	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