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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '1819-override-ce' into 'master'	Rémy Coutable	2018-01-15	3	-0/+128
\|\ \| \| \| \| \| \| \| \|	CE: Override module to specify that we're overriding See merge request gitlab-org/gitlab-ce!16131
\| *	Merge remote-tracking branch 'upstream/master' into 1819-override-ce	Lin Jen-Shin	2018-01-12	120	-574/+1899
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (621 commits) Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Update export message to mention we can download the file from the UI Fix Ctrl+Enter keyboard shortcut saving comment/note edit fix case where tooltip messes up :last-child selector Add reason to keep postgresql 9.2 for CI Remove warning noise in ProjectImportOptions Add changelog entry Add RedirectRoute factory Update Ingress extra cost note to be more generic Fix Rubocop offense Refactor dispatcher project branches path Revert "Revert "Fix Route validation for unchanged path"" Document that we need rsync for backing up Docs: move article "Laravel and Envoy w/ CI/CD" Recommend against the use of EFS Adds Rubocop rule for line break around conditionals Update CHANGELOG.md for 10.1.6 Filter out build traces from logged parameters Refactored project:n* imports in dispatcher.js ...
\| * \|	Use `Gitlab::Utils::Override` over defined?(super)	Lin Jen-Shin	2017-12-26	3	-0/+128
\| \| \|
* \| \|	Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'	Robert Speicher	2018-01-15	2	-22/+57
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate importing repository to Gitaly Closes gitaly#907 See merge request gitlab-org/gitlab-ce!16431
\| * \| \|	Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitaly	Ahmad Sherif	2018-01-15	3	-23/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#907
* \| \| \|	Resolve "Managed Prometheus deployment installs a lot of extra stuff"	Mayra Cabrera	2018-01-15	2	-10/+35
\| \| \| \|
* \| \| \|	Merge branch '38540-ssh-env-file' into 'master'	Douwe Maan	2018-01-15	1	-10/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "rake gitlab:shell:install creates ~git/.ssh/environment which gitlab:check complains about" Closes #38540 See merge request gitlab-org/gitlab-ce!16114
\| * \| \| \|	Remove .ssh/environment file that now breaks the gitlab:check rake task	Ricketts, M (Mike)	2017-12-22	1	-10/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master'	Sean McGivern	2018-01-15	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Gitaly version to 0.69.0 See merge request gitlab-org/gitlab-ce!16460
\| * \| \| \| \|	Bump Gitaly version to 0.69.0	Ahmad Sherif	2018-01-15	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '42025-fix-issue-api' into 'master'	Sean McGivern	2018-01-15	1	-2/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[API] Fix creating issue when assignee_id is empty See merge request gitlab-org/gitlab-ce!16458
\| * \| \| \|	[API] Fix creating issue when assignee_id is empty42025-fix-issue-api	Valery Sizov	2018-01-15	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see https://gitlab.com/gitlab-org/gitlab-ce/issues/42025
* \| \| \| \|	Merge branch 'fix-duplication-circuit-breakers' into 'master'	Douwe Maan	2018-01-15	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplication in API::CircuitBreakers See merge request gitlab-org/gitlab-ce!16456
\| * \| \| \|	Fix duplication in API::CircuitBreakers	Serdar Dogruyol	2018-01-15	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Fixing request json mime type	Francisco Javier López	2018-01-15	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-log-when-user-blocked' into 'master'	Douwe Maan	2018-01-15	1	-0/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log and send a system hook if a blocked user attempts to login Closes #41633 See merge request gitlab-org/gitlab-ce!16451
\| * \| \| \| \|	Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked	Stan Hu	2018-01-14	1	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41633
* \| \| \| \| \|	Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'	Grzegorz Bizon	2018-01-15	3	-34/+53
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#can_be_merged? to Gitaly Closes gitaly#893 See merge request gitlab-org/gitlab-ce!16316
\| * \| \| \| \|	Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly	Ahmad Sherif	2018-01-11	3	-34/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Introduce PredicateMemoization cop and fix offenses	Lin Jen-Shin	2018-01-12	6	-10/+38
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	with StrongMemoize
* \| \| \| \|	Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'	Douwe Maan	2018-01-12	1	-4/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Attachments in e-mail notifications are using the wrong URL" Closes #41882 See merge request gitlab-org/gitlab-ce!16364
\| * \| \| \| \|	Ensure that emails contain absolute, rather than relative, links to user uploads	Nick Thomas	2018-01-11	1	-4/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'	Robert Speicher	2018-01-11	2	-1/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate rebase_in_progress? to Gitaly Closes gitaly#866 See merge request gitlab-org/gitlab-ce!16286
\| * \| \| \| \| \|	Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitaly	Ahmad Sherif	2018-01-10	2	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#866
* \| \| \| \| \| \|	Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'	Robert Speicher	2018-01-11	2	-22/+76
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#rebase to Gitaly Closes gitaly#863 See merge request gitlab-org/gitlab-ce!16259
\| * \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitaly	Ahmad Sherif	2018-01-10	2	-22/+76
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#863
* \| \| \| \| \| \|	Adds Rubocop rule for line break around conditionals	🙈 jacopo beschi 🙉	2018-01-11	51	-0/+73
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'remove-soft-removals' into 'master'	Douwe Maan	2018-01-11	5	-5/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
\| * \| \| \| \| \| \|	Remove soft removals related code	Yorick Peterse	2018-01-08	5	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* \| \| \| \| \| \| \|	Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'	Rémy Coutable	2018-01-11	2	-17/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate merged_branch_names to Gitaly Closes gitaly#851 See merge request gitlab-org/gitlab-ce!16157
\| * \| \| \| \| \| \| \|	Migrate merged_branch_names to Gitaly	Ahmad Sherif	2018-01-11	2	-17/+47
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#851
* \| \| \| \| \| \| \|	Merge branch 'option-disable-archive-cache' into 'master'	Sean McGivern	2018-01-11	1	-0/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to disable git archive caching in workhorse See merge request gitlab-org/gitlab-ce!16325
\| * \| \| \| \| \| \|	Add option to disable git archive caching in workhorseoption-disable-archive-cache	Jacob Vosmaer	2018-01-09	1	-0/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38068-commits-count' into 'master'	Yorick Peterse	2018-01-11	1	-0/+26
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
\| * \| \| \| \| \| \| \|	Denormalize commits count for merge request diffs38068-commits-count	Jan Provaznik	2018-01-10	1	-0/+26
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* \| \| \| \| \| \| \|	Merge branch '39214__pipeline_api' into 'master'	Sean McGivern	2018-01-11	1	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
\| * \| \| \| \| \| \| \|	Fix style	Tony Rom	2018-01-10	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add `pipelines` endpoint to merge requests API	Tony Rom	2017-12-15	1	-0/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'gcp-fix' into 'master'	Kamil Trzciński	2018-01-11	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
\| * \| \| \| \| \| \| \| \|	Add missing user agent header to GCP client	Matija Čupić	2018-01-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix billing checking	Kamil Trzciński	2018-01-10	1	-2/+2
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'git-write-ref-prep' into 'master'	Robert Speicher	2018-01-10	1	-2/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
\| * \| \| \| \| \| \| \| \|	Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prep	Kim "BKC" Carlbäcker	2018-01-09	1	-2/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'da-verify-integrity-of-uploaded-files' into 'master'	Robert Speicher	2018-01-10	1	-0/+44
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Verify integrity of uploaded files" Closes #39949 See merge request gitlab-org/gitlab-ce!16297
\| * \| \| \| \| \| \| \| \|	Fix small typos	Douglas Barbosa Alexandre	2018-01-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add rake task to check integrity of uploaded files	Douglas Barbosa Alexandre	2018-01-08	1	-0/+44
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master'	Douwe Maan	2018-01-10	2	-34/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate GitlabProject (re)move project endpoints Closes gitaly#873 See merge request gitlab-org/gitlab-ce!16249
\| * \| \| \| \| \| \| \| \|	Migrate GitlabProject (re)move project endpoints	Zeger-Jan van de Weg	2018-01-09	2	-34/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration is done through a small refactoring, which makes us call endpoins which are performing the same actions for namespaces. Tests are added to ensure only the project is removed that should be removed. Closes gitlab-org/gitaly#873
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master'	Sean McGivern	2018-01-10	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for multiple refmaps to RemoteService#add_remote Closes gitaly#903 See merge request gitlab-org/gitlab-ce!16331
\| * \| \| \| \| \| \| \| \| \|	Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmap	Ahmad Sherif	2018-01-09	1	-3/+5
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#903