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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Remove source_branch_name commit check	Stan Hu	2019-04-18	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should already be done in Gitlab::Git:Compare.
\| * \| \| \| \| \|	Don't create a temp reference for branch comparisons within project	Stan Hu	2019-04-18	3	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A temp reference is only needed to fetch a branch from another project, as in the case for forked repositories. For branch comparisons within the same project, we can just use the existing branch names to do the comparison. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_126107862
* \| \| \| \| \| \|	Merge branch '59572-remove-protected-branch-creation-flag' into 'master'	Sean McGivern	2019-04-23	2	-80/+44
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove protected_branch_creation feature flag Closes #59572 See merge request gitlab-org/gitlab-ce!27543
\| * \| \| \| \| \|	Remove protected_branch_creation feature flag59572-remove-protected-branch-creation-flag	Patrick Bajao	2019-04-22	2	-80/+44
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'tc-move-geo-cursor-bin-ce' into 'master'	Robert Speicher	2019-04-23	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude ee/bin from Naming/FileName cop See merge request gitlab-org/gitlab-ce!27488
\| * \| \| \| \| \| \|	Exclude ee/bin from Naming/FileName coptc-move-geo-cursor-bin-ce	Toon Claes	2019-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/6565
* \| \| \| \| \| \| \|	Merge branch 'sh-bump-sidekiq-5.2.6' into 'master'	Robert Speicher	2019-04-23	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Sidekiq to 5.2.7 See merge request gitlab-org/gitlab-ce!27512
\| * \| \| \| \| \| \| \|	Bump Sidekiq to 5.2.7sh-bump-sidekiq-5.2.6	Stan Hu	2019-04-22	2	-3/+3
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes minor bugs (https://github.com/mperham/sidekiq/blob/master/Changes.md#526) and keeps version used with gitlab-monitor consistent.
* \| \| \| \| \| \| \|	Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'	Phil Hughes	2019-04-23	1	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve EE / CE diff of noteable_discussion See merge request gitlab-org/gitlab-ce!27562
\| * \| \| \| \| \| \| \|	Resolve EE / CE diff of noteable_discussionresolve-ee-ce-diff-of-noteable-discussion	Paul Slaughter	2019-04-22	1	-1/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '58252-web-ide-dropdown-duplicates' into 'master'	Phil Hughes	2019-04-23	5	-64/+64
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE template dropdown showing duplicates" Closes #58252 See merge request gitlab-org/gitlab-ce!27237
\| * \| \| \| \| \| \| \|	Revert "Increased page size to 100"	Natalia Tepluhina	2019-04-23	5	-64/+64
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
* \| \| \| \| \| \| \|	Merge branch '59514-uploading-images-base64' into 'master'	Phil Hughes	2019-04-23	9	-7/+39
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE uploading images shows base64 string" Closes #59514 See merge request gitlab-org/gitlab-ce!27471
\| * \| \| \| \| \| \| \|	Adds changelog entry59514-uploading-images-base64	Denys Mishunov	2019-04-18	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Stores 'binary' and 'rawPath' attr after upload	Denys Mishunov	2019-04-18	5	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When uploading a file, we need to flag binary files correspondingly so that it gets propagated all the way to RepoEditor as it decides on whether to show editor for this or that file or not (shouldHideEditor()) - rawPath needs to be propagate all the way to ContentViewer as well so that uploaded images could be rendered as a base64 image right away instead of raw base64 string
\| * \| \| \| \| \| \| \|	Always hides editor in Web IDE for binary files	Denys Mishunov	2019-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Passes file type down to ContentViewer	Denys Mishunov	2019-04-17	3	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of ContentViewer attempts to compute file type and render appropriate viewer type, compute it on the parent RepoEditor having all file-related information at its disposal and pass it down to ContentViewer as a prop
* \| \| \| \| \| \| \| \|	Merge branch '58850-fix-misplaced-swipe-view' into 'master'	Phil Hughes	2019-04-23	4	-30/+116
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make swipe view images line up Closes #58850 See merge request gitlab-org/gitlab-ce!26969
\| * \| \| \| \| \| \| \|	Make swipe view images line up	ftab	2019-04-23	4	-30/+116
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If left without a width/height, swipeFrame goes off track when the image isn't wide enough to fill the available width. The spaceLeft prevented reaching the right edge of the image.
* \| \| \| \| \| \| \|	Merge branch 'sh-bump-nokogiri-1.10.3' into 'master'	Lin Jen-Shin	2019-04-23	4	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Nokogiri to 1.10.3 See merge request gitlab-org/gitlab-ce!27560
\| * \| \| \| \| \| \| \|	Bump Nokogiri to 1.10.3sh-bump-nokogiri-1.10.3	Stan Hu	2019-04-22	4	-6/+6
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This pulls in a fix for libxslt that addresses CVE-2019-11068: https://github.com/sparklemotion/nokogiri/releases
* \| \| \| \| \| \| \|	Merge branch 'docs/add-cross-links' into 'master'	Evan Read	2019-04-23	1	-18/+21
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add doc cross links for large repositories See merge request gitlab-org/gitlab-ce!27303
\| * \| \| \| \| \| \|	Add doc cross links for large repositories	Steve Azzopardi	2019-04-23	1	-18/+21
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'mk/remove-unused-code' into 'master'	Stan Hu	2019-04-22	1	-6/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused code See merge request gitlab-org/gitlab-ce!27557
\| * \| \| \| \| \|	Remove unused code	Michael Kozono	2019-04-22	1	-6/+0
\|/ / / / / /
* \| \| \| \| \|	Merge branch '57293-fix-image-rename' into 'master'	Clement Ho	2019-04-22	3	-3/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Renaming an image via Web IDE corrupts it" Closes #57293 See merge request gitlab-org/gitlab-ce!27486
\| * \| \| \| \| \|	Revert "Created a hack to prevent setting content on image"	Natalia Tepluhina	2019-04-22	3	-3/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e8c1c930c3bc7c159463ed3bed8765db01b40328.
* \| \| \| \| \|	Merge branch 'patch-52' into 'master'	Stan Hu	2019-04-22	1	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Victor Wu as proofreader See merge request gitlab-org/gitlab-ce!27527
\| * \| \| \| \| \|	Add Victor Wu as proofreader	Victor Wu	2019-04-22	1	-3/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'update-gitlab-runner-helm-chart-to-0-4-0' into 'master'	James Lopez	2019-04-22	3	-3/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Runner Helm Chart to 0.4.0/11.10.0 See merge request gitlab-org/gitlab-ce!27508
\| * \| \| \| \| \|	Update GitLab Runner Helm Chart to 0.4.0update-gitlab-runner-helm-chart-to-0-4-0	Steve Azzopardi	2019-04-19	3	-3/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-fix-pipelines-merged-results' into 'master'	Achilleas Pipinellis	2019-04-22	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update feature name "Pipelines for Merged Results" See merge request gitlab-org/gitlab-ce!27551
\| * \| \| \| \| \| \|	Docs: update feature name "Pipelines for Merged Results"	Marcia Ramos	2019-04-22	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/com-only-badges' into 'master'	Marcia Ramos	2019-04-22	1	-0/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to use GitLab.com only badges See merge request gitlab-org/gitlab-ce!27546
\| * \| \| \| \| \| \|	Document how to use GitLab.com only badges	Achilleas Pipinellis	2019-04-22	1	-0/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Functionality added in https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/449
* \| \| \| \| \| \|	Merge branch 'docs-fix-typo' into 'master'	Achilleas Pipinellis	2019-04-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: fixes grammar/typo See merge request gitlab-org/gitlab-ce!27547
\| * \| \| \| \| \| \|	Docs: fixes grammar/typo	Marcia Ramos	2019-04-22	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'qa/improve-performance-of-login-test-and-remove-comments' into ↵	Ramya Authappan	2019-04-22	3	-10/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Improve performance of login test and remove comments See merge request gitlab-org/gitlab-ce!27515
\| * \| \| \| \| \|	Remove unnecessary comments from login tests	Walmyr	2019-04-22	3	-10/+0
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The comments were TODOs but there were no explanation of what needed to be done. Also, I think the expectation describes very well how it checks that the user is logged in. Finally, as Robert C. Martin said once: "After you check in a TODO comment it turns into a DON'T DO"
* \| \| \| \| \|	Merge branch 'jv-dedup-activerecord' into 'master'	Stan Hu	2019-04-20	6	-8/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong use of ActiveRecord in PoolRepository See merge request gitlab-org/gitlab-ce!27464
\| * \| \| \| \| \|	Fix wrong use of ActiveRecord in PoolRepository	Jacob Vosmaer	2019-04-20	6	-8/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch '57247-show-prioritized-labels-to-guests' into 'master'	Clement Ho	2019-04-19	7	-35/+59
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show prioritized labels to guests Closes #57247 See merge request gitlab-org/gitlab-ce!27307
\| * \| \| \| \| \|	Show prioritized labels to guests57247-show-prioritized-labels-to-guests	Heinrich Lee Yu	2019-04-19	7	-35/+59
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables sorting when guests are viewing
* \| \| \| \| \|	Merge branch 'retry-review-deploy-twice' into 'master'	Lin Jen-Shin	2019-04-19	4	-6/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retry the review-deploy job twice and make the Review App cleanup more efficient See merge request gitlab-org/gitlab-ce!27489
\| * \| \| \| \| \|	Make the Review App cleanup more efficientretry-review-deploy-twice	Rémy Coutable	2019-04-19	4	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that the cleanup starts right away. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Retry the review-deploy job twice	Rémy Coutable	2019-04-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'xanf/gitlab-ce-improve-project-overview' into 'master'	Stan Hu	2019-04-19	6	-4/+45
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to Project overview UI Closes #55025 See merge request gitlab-org/gitlab-ce!26796
\| * \| \| \| \| \| \|	Improvements to Project overview UI	Illya Klymov	2019-04-19	6	-4/+45
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'quarantine-flaky-tests' into 'master'	Lin Jen-Shin	2019-04-19	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Flaky tests: spec/requests/api/badges_spec.rb" Closes #60397 See merge request gitlab-org/gitlab-ce!27484
\| * \| \| \| \| \| \|	Put three flaky tests in quarantinequarantine-flaky-tests	Rémy Coutable	2019-04-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>