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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'backport-sticking-api-helper-changes' into 'master'	Kamil Trzciński	2017-04-04	4	-22/+20
\|\ \| \| \| \| \| \| \| \|	Backport API changes needed to fix sticking in EE See merge request !10376
\| *	Backport API changes needed to fix sticking in EEbackport-sticking-api-helper-changes	Yorick Peterse	2017-03-31	4	-22/+20
\| \| \| \| \| \| \| \| \| \| \| \|	These changes are ported over from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce the number of merge conflicts that may occur.
* \|	Merge branch 'fix-github-importer-slowness' into 'master'	Robert Speicher	2017-04-03	3	-2/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of GitHub importer Closes #28183 See merge request !10273
\| * \|	Set the right timeout for Gitlab::Shell#fetch_remote	Douglas Barbosa Alexandre	2017-04-03	1	-1/+2
\| \| \|
\| * \|	Rename skip_metrics to imported on the importable concern	Douglas Barbosa Alexandre	2017-04-03	1	-1/+1
\| \| \|
\| * \|	Skip MR metrics when importing projects from GitHub	Douglas Barbosa Alexandre	2017-04-03	1	-1/+2
\| \| \|
\| * \|	Fetch GitHub project as a mirror to get all refs at once	Douglas Barbosa Alexandre	2017-04-03	2	-1/+20
\| \| \|
* \| \|	Merge branch 'namespace-race-condition' into 'master'	Douwe Maan	2017-04-03	1	-1/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race condition in namespace directory creation See merge request !10268
\| * \| \|	Fix race condition in namespace directory creation	Robin Bobbitt	2017-04-03	1	-1/+4
\| \| \| \|
* \| \| \|	Merge branch 'feature/support-grpc-calls-over-tcp-conn' into 'master'	Robert Speicher	2017-04-03	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for Gitaly calls over TCP connection Closes gitaly#166 See merge request !10410
\| * \| \| \|	Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-conn	Ahmad Sherif	2017-04-03	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#166
* \| \| \| \|	Merge branch 'feature/add-feature-flags-for-upload-receive-pack' into 'master'	Robert Speicher	2017-04-03	1	-2/+14
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add feature flags for enabling (Upload\|Receive)Pack Closes gitaly#168 See merge request !10341
\| * \| \| \|	Add feature flags for enabling (Upload\|Receive)Pack for Gitalyfeature/add-feature-flags-for-upload-receive-pack	Ahmad Sherif	2017-04-03	1	-2/+14
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#168
* \| \| \|	Merge branch 'style-proc-cop' into 'master'	Rémy Coutable	2017-04-03	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/Proc cop for rubocop See merge request !10382
\| * \| \| \|	Enable Style/Proc cop for rubocop	mhasbini	2017-04-02	2	-3/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '22303-symbolic-in-tree' into 'master'	Douwe Maan	2017-04-03	2	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#22303 fix mode representation git::tree ( in base 8 ) Closes #22303 See merge request !9780
\| * \| \|	Fix symlink icon in project tree	mhasbini	2017-04-02	2	-2/+2
\| \|/ /
* \| \|	Merge branch 'introduce-base-polling-interval' into 'master'	Sean McGivern	2017-04-03	4	-3/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce "polling_interval_multiplier" as application setting Closes #29759 See merge request !10280
\| * \| \|	Introduce "polling_interval_multiplier" as application setting	Adam Niedzielski	2017-04-03	4	-3/+34
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled.
* \| \|	Merge branch 'workhorse-gitaly-repository' into 'master'	Robert Speicher	2017-04-03	1	-2/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass Gitaly 'Repository' messages to workhorse for Git HTTP Closes gitaly#148 See merge request !10343
\| * \| \|	Pass Gitaly Repository messages to workhorse	Jacob Vosmaer	2017-04-03	1	-2/+10
\| \|/ /
* \| \|	Merge branch '29541-fix-github-importer-deleted-fork' into 'master'	Robert Speicher	2017-04-03	2	-11/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitHub importer for PRs of deleted forked repositories Closes #29541 See merge request !9992
\| * \| \|	Minor refactor	Gabriel Mazetto	2017-04-03	2	-12/+7
\| \| \| \|
\| * \| \|	Fix BrachFormatter for removed users	Douglas Barbosa Alexandre	2017-04-03	1	-1/+1
\| \| \| \|
\| * \| \|	One more change to the branch names to preserve metadata	Gabriel Mazetto	2017-04-03	1	-2/+2
\| \| \| \|
\| * \| \|	Prefixes source branch name with short SHA to avoid collision	Douglas Barbosa Alexandre	2017-04-03	2	-9/+17
\| \| \| \|
\| * \| \|	Fix GitHub importer for PRs of deleted forked repositories	Gabriel Mazetto	2017-04-03	2	-4/+20
\| \|/ /
* \| \|	Merge branch 'sh-fix-destroy-user-race' into 'master'	Douwe Maan	2017-04-03	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix race condition where a namespace would be deleted before a project was deleted Closes #30334 and #30306 See merge request !10389
\| * \|	Delete users asynchronouslysh-fix-destroy-user-race	Stan Hu	2017-04-02	1	-1/+1
\| \|/
* \|	Merge branch 'use-gitaly-commit-is-ancestor' into 'master'	Robert Speicher	2017-04-02	2	-0/+19
\|\ \ \| \|/ \|/\| \| \| \| \|	Use gitaly commit is ancestor See merge request !9864
\| *	Make GitLab use Gitaly for commit_is_ancestor	Kim "BKC" Carlbäcker	2017-03-30	2	-0/+19
\| \| \| \| \| \| \| \|	- Migration in Repository#is_ancestor?
* \|	Merge branch 'allow-multiple-paths-in-repository-log' into 'master'	Robert Speicher	2017-03-30	1	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Support >1 path in Gitlab::Git::Repository#log See merge request !10291
\| * \|	Support >1 path in Gitlab::Git::Repository#log	Sean McGivern	2017-03-30	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is analogous to `git log -- foo bar baz`, but not the same as `Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git log -- 'foo bar baz'`.
* \| \|	Merge branch '29843-project-subgroup-transfer' into 'security'	Rémy Coutable	2017-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use full path for moving directories when changing namespace path See merge request !2078
* \| \|	Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into ↵	Alfredo Sumaran	2017-03-29	1	-2/+3
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Reset container width when switching to pipelines MR tab Closes #29539 See merge request !10169
\| * \|	Reset container width when switching to pipelines MR tab	Eric Eastwood	2017-03-28	1	-2/+3
\| \|/ \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
* \|	Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master'	Rémy Coutable	2017-03-29	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make bundle exec rake gitlab:check RAILS_ENV=production Closes #30084 See merge request !10246
\| * \|	There might be ps utilities out there, that assume 80chars instead	Sebastian Reitenbach	2017-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of unlimited width if they cannot detect terminal size, therefore force unlimited terminal size when checking processes via ps.
* \| \|	Merge branch 'gitaly-socket-per-shard' into 'master'	Sean McGivern	2017-03-29	7	-29/+64
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One Gitaly connection per storage shard See merge request !10150
\| * \| \|	Fix custom hooks restore	Jacob Vosmaer	2017-03-29	1	-1/+3
\| \| \| \|
\| * \| \|	Change socket_path to gitaly_address	Jacob Vosmaer	2017-03-29	2	-9/+16
\| \| \| \|
\| * \| \|	Separate GRPC channels per repository storage	Jacob Vosmaer	2017-03-29	4	-25/+28
\| \| \| \|
\| * \| \|	Helper method for storage path stripping	Jacob Vosmaer	2017-03-29	1	-0/+23
\| \| \| \|
* \| \| \|	Merge branch '23655-api-group-issues' into 'master'	Rémy Coutable	2017-03-29	2	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API group/issues default state filter Closes #23655 See merge request !10253
\| * \| \| \|	Fix API group/issues default state filter	Alexander Randa	2017-03-28	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	Labels support color names in backend	Dongqing Hu	2017-03-29	2	-6/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'make_user_mentions_case_insensitive' into 'master'	Sean McGivern	2017-03-29	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make user mentions case-insensitive Closes #24493 See merge request !10285
\| * \| \| \|	Make user mentions case-insensitive	blackst0ne	2017-03-29	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'glensc/gitlab-ce-17325-rugged-gem-update' into 'master'	Robert Speicher	2017-03-28	1	-20/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rugged to 0.25.1.1 Closes #17325, #14972, and #14765 See merge request !10286
\| * \| \| \|	Use Rugged::SORT_NONE instead of Rugged::SORT_DATE	Adam Niedzielski	2017-03-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Meaning of SORT_DATE was changed in libgit2. See https://github.com/libgit2/libgit2/commit/82d4c0e6b841ae0e466bd97ab1faec0920a6b7a2 SORT_NONE is the order produced by "git log".