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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \|	API - Include project in commits&blobs search results	Jarka Kadlecová	2018-02-14	3	-5/+8
\| \| \| \|
* \| \| \|	Merge branch 'remove_ldap_person_validation' into 'master'	Stan Hu	2018-02-13	1	-15/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove problematic LDAP::Person validation for new strategy Closes #42412 and #42359 See merge request gitlab-org/gitlab-ce!16727
\| * \| \| \|	Revert problematic LDAP person validation that threw exceptions	Drew Blessing	2018-02-13	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Constructors shouldn't throw exceptions. We also learned that different LDAP servers behave a bit unexpectedly sometimes - returning attributes we didn't ask for, or returned attributes with language subtypes.
* \| \| \| \|	Merge branch 'whitelisting' into 'master'	Yorick Peterse	2018-02-13	1	-7/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092
\| * \| \| \|	Remove Sentry reporting for query limiting	Yorick Peterse	2018-02-13	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using Sentry, while useful, poses two problems you have to choose from: 1. All errors are reported separately, making it easy to create issues but also making it next to impossible to see other errors (due to the sheer volume of threshold errors). 2. Errors can be grouped or merged together, reducing the noise. This however also means it's (as far as I can tell) much harder to automatically create GitLab issues from Sentry for the offending controllers. Since both solutions are terrible I decided to go with a third option: not using Sentry for this at all. Instead we'll investigate using Prometheus alerts and Grafana dashboards for this, which has the added benefit of being able to more accurately measure the behaviour over time. Note that throwing errors in test environments is still enabled, and whitelisting is still necessary to prevent that from happening (and that in turn still requires that developers create issues).
* \| \| \| \|	Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'	Douwe Maan	2018-02-13	1	-2/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "PrepareUntrackedUploads PostgreSQL syntax error" Closes #42881 See merge request gitlab-org/gitlab-ce!17019
\| * \| \| \|	Fix orphan temp table untracked_files_for_uploads	Michael Kozono	2018-02-12	1	-1/+10
\| \| \| \| \|
\| * \| \| \|	Fix last batch size equals max batch size error	Michael Kozono	2018-02-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jivl-update-katex' into 'master'	Clement Ho	2018-02-12	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
\| * \ \ \ \	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-12	42	-250/+656
\| \|\ \ \ \ \ \| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-05	175	-1353/+4471
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Removed the katex precompile steps from the application configuration	Jose Ivan Vargas	2017-12-21	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	added katex.js and load it via webpack	Jose Ivan Vargas	2017-12-21	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-disable-query-limiter' into 'master'	Ian Baum	2018-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable query limiting warnings for now on GitLab.com See merge request gitlab-org/gitlab-ce!17067
\| * \| \| \| \| \| \|	Disable query limiting warnings for now on GitLab.com	Stan Hu	2018-02-12	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ac/4878-fix-attachments-ext' into 'master'	Nick Thomas	2018-02-12	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Honour workhorse provided file name See merge request gitlab-org/gitlab-ce!17059
\| * \| \| \| \| \| \|	Honour workhorse provided file nameac/4878-fix-attachments-ext	Alessio Caiazza	2018-02-12	1	-4/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the attempt to unify file uploading at workhorse level gitlab-org/gitlab-workhorse!230 we moved to a prefix-based tempfile creation in order to avoid upload collisions. Artifacts and LFS uploads already set original_filename to workhorse provided filename This commit add the same feature to `Gitlab::Middleware::Multipart`
* \| \| \| \| \| \|	Revert "Merge branch ↵rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key	Rubén Dávila	2018-02-12	1	-22/+6
\| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" This reverts commit a58f8c32c62bcf5824d1fe1d0de53e9bda974d65, reversing changes made to cd5d75c362cdf06efb8174eddfbd0f4b65687dec.
* \| \| \| \| \|	Create an empty wiki when there is no wiki in the gitlab export bundle	Valery Sizov	2018-02-12	2	-2/+26
\|/ / / / /