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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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	2	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36847 - add changelog
* \| \| \| \| \|	Merge branch 'add-pagination-commit-diffs' into 'master'	Robert Speicher	2018-02-21	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing pagination on the commit diff endpoint Closes #43370 See merge request gitlab-org/gitlab-ce!17203
\| * \| \| \| \| \|	Add missing pagination on the commit diff endpoint	Maxime Roussin-Belanger	2018-02-19	1	-1/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"	Kárpáti László	2018-02-21	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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
* \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-02-21	1	-4/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40668-pages-domain-api-returns-404-when-using-a-specific-domain' into 'master' Resolve "Pages Domain API returns 404 when using a specific domain" Closes #40668 See merge request gitlab-org/gitlab-ce!17206
\| * \| \| \| \| \|	Fix get a single pages domain when project path contains a period	Travis Miller	2018-02-19	1	-4/+6
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	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 '42050-combine-all-rake-based-lints-in-one-rake-process-in-ci' ↵	Robert Speicher	2018-02-16	1	-0/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Combine all rake based lints in one rake process in CI" Closes #42050 See merge request gitlab-org/gitlab-ce!16732
\| * \| \| \| \|	Run lint:all tasks in forks42050-combine-all-rake-based-lints-in-one-rake-process-in-ci	Rémy Coutable	2018-02-14	1	-11/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Combine all rake tasks in the static-analysis job	Rémy Coutable	2018-02-14	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Fix project import API after import service refactor	James Lopez	2018-02-16	1	-2/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'	Sean McGivern	2018-02-16	3	-0/+73
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API endpoint for importing a project export" Closes #41899 See merge request gitlab-org/gitlab-ce!17025
\| * \| \| \| \| \|	update docs	James Lopez	2018-02-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactor code based on feedback41899-api-endpoint-for-importing-a-project-export	James Lopez	2018-02-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactor code based on feedback	James Lopez	2018-02-14	1	-7/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	refactor api class	James Lopez	2018-02-13	1	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add docs and changelog	James Lopez	2018-02-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add more specs	James Lopez	2018-02-13	1	-6/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix entity	James Lopez	2018-02-13	1	-1/+3
\| \| \| \| \| \| \|