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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Upgrade gitlab-markup gem	Markus Koller	2017-09-20	3	-3/+8
\|
*	Merge branch 'gitlab-git-popen' into 'master'	Douwe Maan	2017-09-20	7	-13/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237
\| *	Use Gitlab::Git's Popen on that module's codegitlab-git-popen	Alejandro Rodríguez	2017-09-20	7	-13/+19
\| \| \| \| \| \| \| \| \| \|	This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module
* \|	Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'	Rémy Coutable	2017-09-20	2	-10/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333
\| * \|	Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlab	Tiago Botelho	2017-09-20	2	-10/+38
\| \| \|
* \| \|	Merge branch 'workhorse-3.1.0' into 'master'	Rémy Coutable	2017-09-20	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 3.1.0 See merge request gitlab-org/gitlab-ce!14390
\| * \| \|	Use gitlab-workhorse 3.1.0	Jacob Vosmaer	2017-09-20	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-counts-caching' into 'master'	Douwe Maan	2017-09-20	12	-15/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
\| * \| \| \|	Fix refreshing of issues/MR count cachesfix-counts-caching	Yorick Peterse	2017-09-19	12	-15/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? \|\| confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061
* \| \| \| \|	Merge branch 'fix-autodevops-monitoring' into 'master'	Kamil Trzciński	2017-09-20	1	-4/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support new auto-deploy helm chart Closes #38028 See merge request gitlab-org/gitlab-ce!14386
\| * \| \| \|	Support new auto-deploy helm chartfix-autodevops-monitoring	Alessio Caiazza	2017-09-20	1	-4/+0
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* \| \| \|	Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'	Rémy Coutable	2017-09-20	3	-4/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
\| * \| \| \|	Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks	Lin Jen-Shin	2017-09-15	1	-1/+6
\| \| \| \| \|
\| * \| \| \|	Enable ee_compat_check for forks, but not EE	Lin Jen-Shin	2017-09-15	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We exclude known EE projects, and check the project directory name for EE forks.
* \| \| \| \|	Merge branch '36884-gitaly-admin-version' into 'master'	Tim Zallmann	2017-09-20	3	-2/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
\| * \| \| \| \|	Add Gitaly version to Admin Dashboard	Jacopo	2017-09-19	3	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays the Gitaly version in the admin dashboard.
* \| \| \| \| \|	Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'	Rémy Coutable	2017-09-20	7	-24/+77
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rewriting issue references with group milestones Closes #37746 See merge request gitlab-org/gitlab-ce!14294
\| * \| \| \| \| \|	Fix rewriting issue references with group milestones	Grzegorz Bizon	2017-09-20	7	-24/+77
\|/ / / / / /
* \| \| \| \| \|	Merge branch '20049-projects-api-forks' into 'master'	Rémy Coutable	2017-09-20	7	-9/+221
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
\| * \| \| \| \|	Employ ForkProjectsFinder in ForksController	Mark Fletcher	2017-09-20	1	-5/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add an API endpoint to determine the forks of a project	Mark Fletcher	2017-09-20	4	-4/+169
\| \| \| \| \| \|
\| * \| \| \| \|	Introduce ForkProjectsFinder class	Mark Fletcher	2017-09-20	2	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Will dry up the code to find projects between the ForksController and the API
* \| \| \| \| \|	Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'	Douwe Maan	2017-09-20	5	-4/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
\| * \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists	Vitaliy @blackst0ne Klachkov	2017-09-20	5	-4/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mk-clarify-moving-namespaces' into 'master'	Douwe Maan	2017-09-20	5	-9/+52
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914
\| * \| \| \| \| \| \|	Add changelog entrymk-clarify-moving-namespaces	Michael Kozono	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add "Changing your username" section to docs	Michael Kozono	2017-09-19	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And link to it from where you change your username.
\| * \| \| \| \| \| \|	Move help for renaming group path to docs	Michael Kozono	2017-09-19	2	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And expand on the help text.
* \| \| \| \| \| \| \|	Merge branch 'zj-fix-seeding-big-projects' into 'master'	Rémy Coutable	2017-09-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove depreceted and big projects Closes #37507 See merge request gitlab-org/gitlab-ce!14336
\| * \| \| \| \| \| \| \|	Remove depreceted and big projects	Zeger-Jan van de Weg	2017-09-20	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'rc/use-set-in-api-specs' into 'master'	Grzegorz Bizon	2017-09-20	13	-81/+90
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `test-prof` and use `set` in API specs See merge request gitlab-org/gitlab-ce!14370
\| * \| \| \| \| \| \| \|	Use set in some API specsrc/use-set-in-api-specs	Rémy Coutable	2017-09-19	11	-81/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Add test-prof	Rémy Coutable	2017-09-19	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'docs-specific-review-examples' into 'master'	Jacob Schatz	2017-09-20	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specific code review guidelines See merge request gitlab-org/gitlab-ce!13206
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 'docs-specific-review-examples'docs-specific-review-examples	Clement Ho	2017-08-01	281	-1615/+3371
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/development/code_review.md
\| * \| \| \| \| \| \| \| \| \|	Add note about UX paradigm	Clement Ho	2017-07-31	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add specific code review guidelinesadd-specific-review-examples	Clement Ho	2017-07-31	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jlh-mit-3rdparty-carveout' into 'master'	Jacob Schatz	2017-09-20	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update LICENSE to carve out third party licenses. See merge request gitlab-org/gitlab-ce!14374
\| * \| \| \| \| \| \| \| \| \| \|	Update LICENSE to carve out third party licenses.jlh-mit-3rdparty-carveout	Jamie Hurewitz	2017-09-19	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'	Robert Speicher	2017-09-20	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
\| * \| \| \| \| \| \| \| \| \| \| \|	Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-error	Ahmad Sherif	2017-09-19	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitaly#589
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'	Stan Hu	2017-09-19	7	-12/+118
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update _show.html.haml	Fabio Busatto	2017-09-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Improve after code-review	Kamil Trzcinski	2017-09-19	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add specs for warning message shown in Auto DevOps settings37894-handle-if-auto-devops-domain-is-not-set	Kamil Trzcinski	2017-09-19	2	-2/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add warning message if domain or cluster are not configured	bokebilly	2017-09-19	6	-12/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2017-09-19	4	-255/+156
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37298-the-prettytime-utils-module-could-use-some-light-maintenance' into 'master' Resolve some tech debt in the prettyTime module Closes #37298 See merge request gitlab-org/gitlab-ce!14058
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Lightly refactor prettyTime module.37298-the-prettytime-utils-module-could-use-some-light-maintenance	Bryce Johnson	2017-09-14	4	-255/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'revert-feature-highlight' into 'master'	Jacob Schatz	2017-09-19	13	-735/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert feature highlight	Clement Ho	2017-09-19	13	-735/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|