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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Port `read_cross_project` ability from EE	Bob Van Landuyt	2018-02-22	6	-1/+235
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '42332-actionview-template-error-366-524-out-of-range' into ↵	Douwe Maan	2018-02-22	1	-1/+11
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'fix-squash-with-renamed-files' into 'master'	Grzegorz Bizon	2018-02-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-10/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-10/+16
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'ce-gitaly-squash-in-progress' into 'master'	Grzegorz Bizon	2018-02-22	2	-1/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	2	-1/+24
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix repo existence check in GitAccessWiki	Jacob Vosmaer (GitLab)	2018-02-22	2	-1/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'mk-improve-background-migration-specs' into 'master'	Stan Hu	2018-02-21	2	-153/+208
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve background migration specs See merge request gitlab-org/gitlab-ce!17162
\| * \| \| \| \| \| \| \| \| \|	Use convenient Rails helpermk-improve-background-migration-specs	Michael Kozono	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Explicitly reference redefined models	Michael Kozono	2018-02-20	2	-152/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And move UntrackedFile into PopulateUntrackedUploadsDependencies, and move its spec into its own file.
\| * \| \| \| \| \| \| \| \| \|	Remove codebase dependencies from a BG migration	Michael Kozono	2018-02-16	2	-6/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specifically, `PopulateUntrackedUploads` and its spec.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master'	Rémy Coutable	2018-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Gem Update] update toml-rb to 1.0.0" Closes #36847 See merge request gitlab-org/gitlab-ce!17259
\| * \| \| \| \| \| \| \| \| \| \|	36847 - update toml-rb to 1.0.0	Ken	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36847 - add changelog
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-guard-against-nil-sidekiq-metrics-server' into 'master'	Robert Speicher	2018-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guard against nil Sidekiq metrics server Closes #41351 See merge request gitlab-org/gitlab-ce!17254
\| * \| \| \| \| \| \| \| \| \| \|	Guard against nil Sidekiq metrics serversh-guard-against-nil-sidekiq-metrics-server	Stan Hu	2018-02-20	1	-1/+1
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41351
* \| \| \| \| \| \| \| \| \| \|	Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queries	Dylan Griffith	2018-02-21	1	-2/+4
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'	Douwe Maan	2018-02-20	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for sidekiq metrics set cardinality growing unbounded Closes #43424 See merge request gitlab-org/gitlab-ce!17235
\| * \| \| \| \| \| \| \| \| \|	Only use features for events	Pawel Chojnacki	2018-02-20	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Put all event metrics exposed to prometheus behind a feature flag	Pawel Chojnacki	2018-02-20	1	-0/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed	Valery Sizov	2018-02-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'	Sean McGivern	2018-02-19	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
\| * \| \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used	James Edwards-Jones	2018-02-19	2	-3/+8
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also avoid double commit lookup during file lock check by reusing memoized commits.
* \| \| \| \| \| \| \| \|	Merge branch '32564-fix-double-system-closing-notes' into 'master'	Sean McGivern	2018-02-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
\| * \| \| \| \| \| \| \| \|	Convert Gitaly commit parent IDs to array as early as possible	Sean McGivern	2018-02-19	1	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
\| * \| \| \| \| \| \| \| \|	applying feedback32564-fix-double-system-closing-notes	Micaël Bergeron	2018-02-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# modified: lib/gitlab/git/commit.rb
\| * \| \| \| \| \| \| \| \|	fix specs	Micaël Bergeron	2018-02-16	1	-0/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'	Sean McGivern	2018-02-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
\| * \| \| \| \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-data	Stan Hu	2018-02-18	1	-0/+1
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the applied diff contains UTF-8 or some other encoded data, the diff returned back from the git process may be in ASCII-8BIT format. Writing this data to stdin may fail if the data because stdin expects this data to be in UTF-8. By switching the output to binmode, we ensure that the diff will always be written as-is. Closes gitlab-org/gitlab-ee#4960
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'	Douwe Maan	2018-02-19	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207
\| * \| \| \| \| \| \| \| \| \|	Fix Error 500 when viewing a commit with a GPG signature in Geo	Stan Hu	2018-02-19	1	-1/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#4825
* \| \| \| \| \| \| \| \| \|	Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵	Douwe Maan	2018-02-19	1	-6/+22
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
\| * \| \| \| \| \| \| \| \|	Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-saving	Rubén Dávila	2018-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch ↵	Rubén Dávila	2018-02-15	1	-6/+22
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* \| \| \| \| \| \| \| \|	Merge branch 'asciidoc_inter_document_cross_references' into 'master'	Sean McGivern	2018-02-16	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set Asciidoctor outfilesuffix to default .adoc Closes #43192 and #17602 See merge request gitlab-org/gitlab-ce!17125
\| * \| \| \| \| \| \| \|	Set Asciidoctor outfilesuffix to default .adoc	Turo Soisenniemi	2018-02-14	1	-1/+2
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without setting outfilesuffix Asciidoctor defaults to .html. When .html is used, inter-document cross references do not work in Gitlab's repository / file renderer. See more information from http://asciidoctor.org/docs/user-manual/#navigating-between-source-files and http://asciidoctor.org/docs/user-manual/#inter-document-cross-references
* \| \| \| \| \| \| \|	Improve error handling for Gitlab::Profiler and improve doc about providing ↵update-profiler-docs-explaining-how-to-provide-user	Dylan Griffith	2018-02-16	1	-0/+1
\| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a user
* \| \| \| \| \| \|	Fixed bug with the user synced attributes when the user doesn't existfj-fixed-bug-17054	Francisco Javier López	2018-02-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fixed user synced attributes metadata after removing current provider	Francisco Javier López	2018-02-15	2	-2/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jej/fix-slow-lfs-object-check' into 'master'	Douwe Maan	2018-02-15	3	-7/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only check LFS integrity for first branch in push Closes #41141 See merge request gitlab-org/gitlab-ce!17098
\| * \| \| \| \| \|	Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-check	James Edwards-Jones	2018-02-15	3	-7/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-02-14	1	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39885-ensure-users-cannot-create-environments-with-leading-slashes' into 'master' Resolve "Environment with starting slash in name causes error" Closes #39885 See merge request gitlab-org/gitlab-ce!17071
\| * \| \| \| \| \|	Ensure users can't create environments with leading or trailing slashes ↵39885-ensure-users-cannot-create-environments-with-leading-slashes	Dylan Griffith	2018-02-13	1	-2/+6
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixes #39885)
* \| \| \| \| \|	Merge branch 'mk-fix-pg-undefined-table-ci-errors' into 'master'	Rémy Coutable	2018-02-14	2	-3/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Build Is Red: Admin > Users > Impersonation Tokens token creation allows creation of a token" Closes gitlab-ee#4914 See merge request gitlab-org/gitlab-ce!17102
\| * \| \| \| \| \|	Avoid dropping tables in test	Michael Kozono	2018-02-14	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And use :migration tag to use deletion strategy, and to avoid caching tables, and to lock into a particular schema. Attempting to fix intermittent spec errors `PG::UndefinedTable: ERROR: relation "public.untracked_files_for_uploads" does not exist`.
* \| \| \| \| \| \|	Merge branch 'fix/template-project-visibility' into 'master'	Douwe Maan	2018-02-14	1	-23/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect description and visibility when creating project from template Closes #42601 See merge request gitlab-org/gitlab-ce!16820
\| * \| \| \| \| \|	Remove Gitlab::ImportExport::ProjectCreator class	George Tsiolis	2018-02-14	1	-23/+0
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '42934-search-api-fix' into 'master'	Sean McGivern	2018-02-14	3	-5/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095