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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Convert switch into if statementdispatcher-if	Clement Ho	2018-02-22	1	-24/+27
\|
*	Merge branch '43373-fix-cache-index-appending' into 'master'	Kamil Trzciński	2018-02-22	3	-2/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "cache key for CI stopped working" Closes #43373 See merge request gitlab-org/gitlab-ce!17260
\| *	Add CHANGELOG entry43373-fix-cache-index-appending	Tomasz Maczukin	2018-02-21	1	-0/+5
\| \|
\| *	Change cache index delimiter to character not recognizable as variable part	Tomasz Maczukin	2018-02-21	2	-2/+2
\| \|
* \|	Update CHANGELOG.md for 10.5.1	Ian Baum	2018-02-22	1	-0/+4
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'dispatcher-import-batch-3' into 'master'	Jacob Schatz	2018-02-22	22	-131/+32
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use dynamic imports in dispatcher (Part 3) See merge request gitlab-org/gitlab-ce!17277
\| * \|	Use dynamic imports in dispatcher (Part 3)	Clement Ho	2018-02-22	22	-131/+32
\|/ /
* \|	Merge branch 'patch-28' into 'master'	Marcia Ramos	2018-02-22	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add link to project visibility settings in push to create project docs See merge request gitlab-org/gitlab-ce!17292
\| * \|	Add link to project visibility settings in push to create project docs	Pedro Moreira da Silva	2018-02-22	1	-1/+1
\| \| \|
* \| \|	Merge branch 'docs-milestones-refactor' into 'master'	Marcia Ramos	2018-02-22	8	-40/+88
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
\| * \| \|	Update docs milestonesdocs-milestones-refactor	Victor Wu	2018-02-21	8	-40/+88
\| \| \| \|
* \| \| \|	Merge branch 'docs-replace-prod-names' into 'master'	🚄 Job van der Voort 🚀	2018-02-22	11	-22/+45
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: search/replace "Enterprise Edition" and adjust when applicable See merge request gitlab-org/gitlab-ce!17161
\| * \| \| \|	Docs: search/replace "Enterprise Edition" and adjust when applicable	Marcia Ramos	2018-02-22	11	-22/+45
\|/ / / /
* \| \| \|	Merge branch 'fix-500-for-invalid-upload-path' into 'master'	Sean McGivern	2018-02-22	6	-1/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
\| * \| \| \|	Fix 500 error when loading an invalid upload URL	Sean McGivern	2018-02-22	6	-1/+40
\| \| \| \| \|
* \| \| \| \|	Merge branch 'revert-3487441b' into 'master'	Sean McGivern	2018-02-22	3	-12/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'tc-info-version-check' into 'master'" See merge request gitlab-org/gitlab-ce!17269
\| * \| \| \| \|	Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441b	Victor Wu	2018-02-21	3	-12/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !17257
* \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴)	2018-02-22	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43416-document-where-user-clone-fetch-activity-appears-in-the-logs' into 'master' Resolve "document where user clone/fetch activity appears in the logs" Closes #43416 See merge request gitlab-org/gitlab-ce!17227
\| * \| \| \| \| \|	add lines describing how to find user clone/fetch activity43416-document-where-user-clone-fetch-activity-appears-in-the-logs	Diana Stanley	2018-02-19	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'reduce-ce-ee-disrepancies-in-js' into 'master'	Filipa Lacerda	2018-02-22	22	-45/+59
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Harmonize CE and EE JS code See merge request gitlab-org/gitlab-ce!17264
\| * \| \| \| \| \| \|	Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-js	Rémy Coutable	2018-02-22	22	-44/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Fix the groupLabelsPath in app/assets/javascripts/api.js	Rémy Coutable	2018-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵	Douwe Maan	2018-02-22	3	-1/+38
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "ActionView::Template::Error: 366..524 out of range" Closes #42332 See merge request gitlab-org/gitlab-ce!17262
\| * \| \| \| \| \| \|	Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-range	Sean McGivern	2018-02-22	3	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rugged sometimes chops a context line in between bytes, resulting in the context line having an invalid encoding: https://github.com/libgit2/rugged/issues/716 When that happens, we will try to detect the encoding for the diff, and sometimes we'll get it wrong. If that difference in encoding results in a difference in string lengths between the diff and the underlying blobs, we'd fail to highlight any inline diffs, and return a 500 status to the user. As we're using the underlying blobs, the encoding is 'correct' anyway, so if the string range is invalid, we can just discard the inline diff highlighting. We still report to Sentry to ensure that we can investigate further in future.
* \| \| \| \| \| \| \|	Merge branch '43495-spec-failure-spec-features-users_spec-rb' into 'master'	Sean McGivern	2018-02-22	8	-247/+194
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Spec failure: spec/features/users_spec.rb" Closes #43495 See merge request gitlab-org/gitlab-ce!17289
\| * \| \| \| \| \| \| \|	Fix user feature specs that were hardcoding 'user1'43495-spec-failure-spec-features-users_spec-rb	Rémy Coutable	2018-02-22	8	-247/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'webpack-autoinclude' into 'master'	Jacob Schatz	2018-02-22	1	-6/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of Webpack auto include for EE imports See merge request gitlab-org/gitlab-ce!17282
\| * \| \| \| \| \| \| \|	Backport of Webpack auto include for EE imports	Clement Ho	2018-02-22	1	-6/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-squash-with-renamed-files' into 'master'	Grzegorz Bizon	2018-02-22	3	-5/+33
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix squash with renamed files Closes gitlab-ee#4975 See merge request gitlab-org/gitlab-ce!17216
\| * \| \| \| \| \| \| \|	Fix squash with renamed filesfix-squash-with-renamed-files	Sean McGivern	2018-02-19	3	-5/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to ignore the names for renamed files when configuring with sparse checkout.
* \| \| \| \| \| \| \| \|	Merge branch 'zj-branch-contains-git-message' into 'master'	Douwe Maan	2018-02-22	3	-10/+48
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow branchnames to be named the same as the commit it points to See merge request gitlab-org/gitlab-ce!17231
\| * \| \| \| \| \| \| \| \|	Handle branch and tag names which are commit ids	Zeger-Jan van de Weg	2018-02-21	3	-10/+48
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a test where a branch name is also a valid commit id. Git, the binary should create an error message which is difficult to parse and leading to errors later, as seen in: gitlab-org/gitlab-ce#43222 To catch these cases in the future, gitlab-test@1942eed5cc108b19c7405106e81fa96125d0be22 was created. Which a branch name matching the commit
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-02-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Format markdown.md to comply with what it describes. See merge request gitlab-org/gitlab-ce!17284
\| * \| \| \| \| \| \| \| \|	Format markdown.md to comply with what it describes.	Ulf Rompe	2018-02-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the text says "here are two spaces to force a line break" there really should be two spaces to force a line break.
* \| \| \| \| \| \| \| \| \|	Update VERSION to 10.6.0-prev10.6.0.pre	Mark Fletcher	2018-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.5.0	Mark Fletcher	2018-02-22	160	-804/+192
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'jramsay-detailed-proofreader-process-docs' into 'master'	Douwe Maan	2018-02-22	1	-3/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more detail to the proofreader process See merge request gitlab-org/gitlab-ce!17279
\| * \| \| \| \| \| \| \| \|	No `../` is necessary for linking pages in the same directory.jramsay-detailed-proofreader-process-docs	Connor Shea	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Link directly to proofreader.md	James Ramsay	2018-02-21	1	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add more detail to the proofreader process	James Ramsay	2018-02-21	1	-3/+20
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-02-22	6	-152/+100
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation' into 'master' Resolve "Followup to New design for cancel/stop pipeline confirmation" Closes #42886 See merge request gitlab-org/gitlab-ce!17106
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-21	413	-6913/+5810
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ↵	Shah El-Rahman	2018-02-16	13	-55/+27
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
\| * \| \| \| \| \| \| \| \| \| \|	Remove use of callback in pipeline stop/retry modals	Shah El-Rahman	2018-02-16	6	-152/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make changes to names of events and variables Combine stop and retry modals into 1 Fix lint issues Add comment about usage of eventHub instead of props
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-gitaly-squash-in-progress' into 'master'	Grzegorz Bizon	2018-02-22	4	-2/+51
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC See merge request gitlab-org/gitlab-ce!17002
\| * \| \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's RepositoryService.IsSquashInProgress RPCce-gitaly-squash-in-progress	Alejandro Rodríguez	2018-02-21	4	-2/+51
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '43134-reduce-queries-pipelines-controller-show' into 'master'	Grzegorz Bizon	2018-02-22	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Controller Projects::PipelinesController#show executes more than 100 SQL queries" Closes #43134 See merge request gitlab-org/gitlab-ce!17168
\| * \| \| \| \| \| \| \| \| \| \| \|	Add inverse_of pipeline -> statuses -> pipeline (#43134)43134-reduce-queries-pipelines-controller-show	Dylan Griffith	2018-02-22	2	-1/+6
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'git-access-existence-check' into 'master'	Robert Speicher	2018-02-22	5	-7/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix repo existence check in GitAccessWiki Closes #43385 and gitlab-com/infrastructure#3734 See merge request gitlab-org/gitlab-ce!17268
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix repo existence check in GitAccessWiki	Jacob Vosmaer (GitLab)	2018-02-22	5	-7/+29
\|/ / / / / / / / / / / /