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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Merge branch 'mk-improve-background-migration-specs' into 'master'	Stan Hu	2018-02-21	3	-348/+353
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve background migration specs See merge request gitlab-org/gitlab-ce!17162
\| * \| \| \| \| \| \| \| \|	Prefer `table` helper in migration specs	Michael Kozono	2018-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move TrackUntrackedUploadsHelpers	Michael Kozono	2018-02-20	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into MigrationsHelpers namespace just for organization.
\| * \| \| \| \| \| \| \| \|	Explicitly reference redefined models	Michael Kozono	2018-02-20	2	-261/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And move UntrackedFile into PopulateUntrackedUploadsDependencies, and move its spec into its own file.
\| * \| \| \| \| \| \| \| \|	Remove more BG migration spec dependencies	Michael Kozono	2018-02-16	2	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the `PrepareUntrackedUploads` spec.
\| * \| \| \| \| \| \| \| \|	Remove codebase dependencies from a BG migration	Michael Kozono	2018-02-16	1	-97/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specifically, `PopulateUntrackedUploads` and its spec.
* \| \| \| \| \| \| \| \| \|	Merge branch '26039-Update-to-github-linguist5.3.x' into 'master'	Robert Speicher	2018-02-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update to github-linguist 5.3.x" Closes #26039 See merge request gitlab-org/gitlab-ce!17241
\| * \| \| \| \| \| \| \| \|	26039 - update github-linguist to 5.3.3 version	Ken	2018-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	26039 - add merge request id 26039 change due to lingust source file updates
* \| \| \| \| \| \| \| \| \|	Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queries	Dylan Griffith	2018-02-21	1	-8/+23
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Add unit tests for Gitaly typeszj-unit-test-gitaly-arrays	Zeger-Jan van de Weg	2018-02-20	2	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed	Valery Sizov	2018-02-19	1	-2/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'	Sean McGivern	2018-02-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also avoid double commit lookup during file lock check by reusing memoized commits.
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'	Sean McGivern	2018-02-19	1	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/+25
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-3/+58
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-3/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Revert "Merge branch ↵	Rubén Dávila	2018-02-15	1	-0/+35
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* \| \| \| \| \| \| \|	Allow oxford commas and spaces before commas in MR issue closing pattern.	Vicky Chijwani	2018-02-17	1	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'asciidoc_inter_document_cross_references' into 'master'	Sean McGivern	2018-02-16	1	-0/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+8
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \|	Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master'	Sean McGivern	2018-02-16	1	-0/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about how to provide a user to Gitlab::Profiler See merge request gitlab-org/gitlab-ce!17169
\| * \| \| \| \| \| \|	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/+9
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a user
* \| \| \| \| \| \|	Fix specdm-escape-commit-message	Douwe Maan	2018-02-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Escape HTML entities in commit messages	Douwe Maan	2018-02-15	1	-7/+2
\|/ / / / / /
* \| \| \| \| \|	Fixed user synced attributes metadata after removing current provider	Francisco Javier López	2018-02-15	2	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jej/fix-slow-lfs-object-check' into 'master'	Douwe Maan	2018-02-15	1	-2/+17
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+17
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Kamil Trzciński	2018-02-14	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	-0/+5
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	(Fixes #39885)
* \| \| \| \|	Avoid dropping tables in test	Michael Kozono	2018-02-14	2	-24/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'remove_ldap_person_validation' into 'master'	Stan Hu	2018-02-13	1	-9/+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	-9/+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	-12/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-116/+54
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "PrepareUntrackedUploads PostgreSQL syntax error" Closes #42881 See merge request gitlab-org/gitlab-ce!17019
\| * \| \| \| \| \|	Dry up specmk-fix-no-untracked-upload-files-error	Michael Kozono	2018-02-12	1	-107/+29
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix orphan temp table untracked_files_for_uploads	Michael Kozono	2018-02-12	1	-25/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix last batch size equals max batch size error	Michael Kozono	2018-02-12	1	-0/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-no-cache-populate-migration' into 'master'	Sean McGivern	2018-02-13	1	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable caching of tables for migration spec that drops a temporary table See merge request gitlab-org/gitlab-ce!16965
\| * \| \| \| \| \| \|	Use the :migration metadata in migration specs	Rémy Coutable	2018-02-12	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Disable caching of tables for migration spec that drops a temporary table	Stan Hu	2018-02-12	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to fix job failures, such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51409392.
* \| \| \| \| \| \|	Merge branch 'sh-disable-query-limiter' into 'master'	Ian Baum	2018-02-12	1	-4/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-4/+6
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ac/4878-fix-attachments-ext' into 'master'	Nick Thomas	2018-02-12	1	-3/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-3/+7
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-35/+0
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	1	-0/+45
\|/ / / / /