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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ce/master'	Robert Speicher	2015-12-17	1	-2/+20
\|\
\| *	Use gitlab-shell 2.6.9gitlab-shell-2.6.9	Jacob Vosmaer	2015-12-17	1	-1/+1
\| \|
\| *	Use gitlab-workhorse 0.5.1gitlab-workhorse-0.5.1	Jacob Vosmaer	2015-12-17	1	-1/+1
\| \|
\| *	Gitlab-workhorse related 8.3 update changes	Jacob Vosmaer	2015-12-15	1	-1/+19
\| \|
\| *	Update 8.2-to-8.3 guide	Robert Speicher	2015-12-14	1	-8/+5
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Update gitlab-workhorse and remove mention of gitlab-git-http-server	Stan Hu	2015-12-14	1	-18/+5
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Rename gitlab-git-http-server mention with gitlab-workhorse	Stan Hu	2015-12-14	1	-1/+1
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Add upgrade guide for 8.2 to 8.3	Stan Hu	2015-12-14	1	-0/+200
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Update 8.2-to-8.3 guide	Robert Speicher	2015-12-14	1	-8/+5
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'add-upgrade-guide-for-8-3' into 'master'	Robert Speicher	2015-12-14	1	-0/+187
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add upgrade guide for 8.2 to 8.3 Making sure we don't forget mentioning the need to upgrade Redis from !1888. Added this in preparation for 8.3. [ci skip] See merge request !2085
* \|	Merge branch '8-3-update-guide'	Robert Speicher	2015-12-14	1	-0/+92
\|\ \ \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Add 8.3 CE-to-EE guide	Robert Speicher	2015-12-14	1	-0/+92
\| \| \|
* \| \|	Merge branch 'master' into ee_master	Valery Sizov	2015-12-14	2	-4/+3
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Rename mention of gitlab-git-http-server to gitlab-workhorse	Stan Hu	2015-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes https://github.com/gitlabhq/gitlabhq/issues/9904
\| *	Update init script only once	Felix Eckhofer	2015-12-09	1	-2/+1
\| \| \| \| \| \| \| \|	The init script is already being updated in section 6.
\| *	Remove the prepended v on GitLab Workhorse upgrade docfix-workhorse-upgrade-info	Kelvin	2015-12-08	1	-1/+1
\| \|
* \|	Merge branch 'master' into ce_upstream	Valery Sizov	2015-12-03	2	-14/+33
\|\ \ \| \|/
\| *	Also update gitlab-workhorse in patch updates [ci skip]workhorse_in_patch_update	Achilleas Pipinellis	2015-12-02	1	-13/+32
\| \|
\| *	Use gitlab-shell 2.6.8 in update guide	Jacob Vosmaer	2015-11-30	1	-1/+1
\| \|
\| *	Merge branch 'workhorse-version' into 'master'	Jacob Vosmaer	2015-11-20	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab Workhorse version to 0.4.2 See merge request !1830
\| \| *	Update gitlab-workhorse docs to 0.4.2workhorse-version	Robert Schilling	2015-11-19	1	-1/+1
\| \| \|
\| * \|	Update gitlab-shell documentation [ci skip]	Robert Schilling	2015-11-19	1	-1/+1
\| \|/
* \|	Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream	Valery Sizov	2015-11-24	2	-7/+8
\|\ \
\| * \	Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee	Robert Speicher	2015-11-20	1	-1/+1
\| \|\ \
\| \| * \|	Merge branch 'workhorse-version' into 'master'	Jacob Vosmaer	2015-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab Workhorse version to 0.4.2 See merge request !1830
\| \| * \|	Merge branch 'update-gitlab-shell-doc' into 'master'	Robert Speicher	2015-11-19	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-shell documentation to 2.6.7 See merge request !1836
\| \| *	Merge branch 'http-to-https' into 'master'	Achilleas Pipinellis	2015-11-17	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite HTTP links to force TLS, where possible I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible. See merge request !1806
\| \| \| *	Rewrite HTTP links to force TLS, where possible	Alex Jordan	2015-11-16	1	-1/+1
\| \| \| \|
\| \| * \|	Update doc/update/8.1-to-8.2.md	Robert Speicher	2015-11-13	1	-6/+7
\| \| \|/ \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge 8-2-stable into 8-2-stable-ee	Robert Speicher	2015-11-19	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts remaining: - app/controllers/groups/group_members_controller.rb - app/controllers/projects/project_members_controller.rb - app/models/ability.rb - app/models/member.rb - app/models/project.rb
* \| \|	Merge branch 'master' into ee-to-ce-downgrade-doc	Patricio Cano	2015-11-16	1	-0/+4
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/README.md
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee	Valery Sizov	2015-11-16	1	-0/+91
\| \|\ \
\| * \ \	Merge remote-tracking branch 'ce/master' into ce-to-ee	Robert Speicher	2015-11-13	1	-0/+4
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2015-11-10	1	-0/+4
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change documentation of converting a MySQL-Database to a Postgres one The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 closes #2904 See merge request !1549
\| \| \| * \|	Changed documentation of converting a MySQL-Database with Gitlab to a ↵	Tim Jabs	2015-11-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904
* \| \| \| \|	Added documentation on how to downgrade from EE to CE	Patricio Cano	2015-11-16	1	-0/+5
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Add 8.2 CE-to-EE update guide	Robert Speicher	2015-11-13	1	-0/+91
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge remote-tracking branch 'origin/master' into ce_upsteram	Valery Sizov	2015-11-05	1	-0/+188
\|\ \ \ \| \|/ /
\| * \|	Make sed command GNU-compatiblegitlab-workhorse	Jacob Vosmaer	2015-10-29	1	-1/+1
\| \| \|
\| * \|	Add missing "cd"	Jacob Vosmaer	2015-10-29	1	-0/+1
\| \| \|
\| * \|	Switch to gitlab-workhorse	Jacob Vosmaer	2015-10-29	1	-0/+187
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-10-23	3	-7/+36
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'rs-8-1-update-guide-changes' into 'master'	Robert Speicher	2015-10-20	1	-4/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update 8.0-to-8.1 update guide - User needs to update gitlab-git-http-server - User needs to update Nginx configuration [ci skip] See merge request !1625
\| * \|	Simplify patch version updates (less steps)	Benny Schimmer	2015-10-20	1	-3/+1
\| \| \|
\| * \|	Merge branch 'gitlab-git-http-server-version' into 'master'	Robert Speicher	2015-10-16	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track compatible gitlab-git-http-server version The 'git archive' changes in GitLab 8.1 require a version of gitlab-git-http-server that is incompatible with GitLab 8.0, so we need to keep track of this now. See merge request !1603
\| \| * \|	Track compatible gitlab-git-http-server versiongitlab-git-http-server-version	Jacob Vosmaer	2015-10-15	1	-0/+1
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'ce/master'	Robert Speicher	2015-10-16	1	-0/+141
\|\ \ \ \ \| \|/ / /
\| * \| \|	Remove 8.0-only steps from the 8.1 update guide	Robert Speicher	2015-10-15	1	-89/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds a preamble note that a working 8.0 installation (i.e., gitlab-git-http-server, updated Nginx/Apache configs) is required before proceeding. [ci skip]
\| * \| \|	Remove notes about CI migration from 8.1 update guide	Robert Speicher	2015-10-15	1	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Add 8.0-to-8.1 update guide	Robert Speicher	2015-10-15	1	-0/+228
\| \| \| \|