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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve weight icon	Drew Blessing	2015-12-22	2	-1/+1
\|
*	Minor clean up and rewording	Achilleas Pipinellis	2015-12-18	1	-4/+6
\|
*	update issue_weights documentation	Job van der Voort	2015-12-18	1	-7/+9
\|
*	Make draft docs for issue weight feature	Dmitriy Zaporozhets	2015-12-18	3	-0/+12
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge remote-tracking branch 'ce/master'	Robert Speicher	2015-12-17	3	-18/+83
\|\
\| *	[ci skip] Add SVN to Git migration documentation	Drew Blessing	2015-12-15	3	-17/+83
\| \|
* \|	Merge branch 'master' into ee_master	Valery Sizov	2015-12-14	4	-0/+16
\|\ \ \| \|/
\| *	Tweak text of documentation	Douwe Maan	2015-12-08	1	-3/+3
\| \|
\| *	Rewrite docs	Douwe Maan	2015-12-08	6	-12/+8
\| \|
\| *	Merge branch 'master' into merge-if-green	Zeger-Jan van de Weg	2015-12-07	6	-49/+80
\| \|\
\| * \|	Doc feature Merge When Build Succeeds	Zeger-Jan van de Weg	2015-12-02	3	-0/+20
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-12-01	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add reference to Microsoft's Git Credential Manager for Windows.	Eirik Lygre	2015-11-24	1	-2/+2
\| \| \|
* \| \|	Mention repository mirroring for new projects in docs.	Douwe Maan	2015-11-30	2	-1/+11
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-11-24	3	-0/+169
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'required_version_and_docs_update' into 'master'	Dmitriy Zaporozhets	2015-11-23	3	-41/+74
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update required version of lfs client and separate the docs for users and admins. See merge request !1855
\| \| * \|	Add few fixes to documentation based on comments from review	Dmitriy Zaporozhets	2015-11-23	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \|	Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_update	Marin Jankovski	2015-11-20	3	-41/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admins.
\| * \| \|	Add award_emoji.png doc image	Robert Speicher	2015-11-21	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Use award emoticons in GitLab workflow [ci skip]	Robert Schilling	2015-11-21	2	-5/+4
\| \|/ /
\| * \|	Update LFS docs for cloning [ci skip]update-lfs-docs	Robert Schilling	2015-11-19	1	-3/+2
\| \| \|
\| * \|	Add link to git-lfs client [ci skip]	Robert Schilling	2015-11-19	1	-1/+1
\| \|/
\| *	missing .	Job van der Voort	2015-11-18	1	-4/+2
\| \|
\| *	Updates to the lfs doc.	Marin Jankovski	2015-11-18	1	-13/+24
\| \|
\| *	LFS doc, first draftadd_lfs_doc	Marin Jankovski	2015-11-17	1	-0/+127
\| \|
* \|	Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee	Robert Speicher	2015-11-21	1	-0/+0
\|\ \
\| * \|	Add award_emoji.png doc image	Robert Speicher	2015-11-21	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee	Robert Speicher	2015-11-21	2	-5/+4
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'award-emoji-doc' into 'master'	Robert Speicher	2015-11-21	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use award emoticons in GitLab workflow Remove the old voting slides and use the emoji bar. [ci skip] See merge request !1863
* \| \|	Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into ↵	Dmitriy Zaporozhets	2015-11-20	1	-3/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	8-2-stable-ce-to-ee Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Update LFS docs for cloning [ci skip]	Robert Schilling	2015-11-20	1	-3/+2
\| \| \|
\| * \|	Merge branch 'lfs-client-doc' into 'master'	Job van der Voort	2015-11-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to git-lfs client [ci skip] See merge request !1832
\| * \|	Merge branch 'add_lfs_doc' into 'master'	Job van der Voort	2015-11-19	1	-0/+136
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for Git LFS Doc explaining how to use Git LFS, how to use Git LFS with GitLab, known issues and troubleshooting tips. See merge request !1813
\| *	Merge branch 'http-to-https' into 'master'	Achilleas Pipinellis	2015-11-17	2	-8/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-8/+8
\| \| \|
\| * \|	Some code and doc improvementsglobal-milestones	Dmitriy Zaporozhets	2015-11-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add milestones documentation to workflow	Dmitriy Zaporozhets	2015-11-16	4	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge 8-2-stable into 8-2-stable-ee	Robert Speicher	2015-11-19	7	-8/+158
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'mirror-repository' into 'master'	Douwe Maan	2015-11-18	5	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to mirror an upstream repository. Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/279 Depends on gitlab-org/gitlab-shell!29 To do: - [x] Decide on what user should be the author of the activity feed events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team. - [x] Write specs! - [x] Write documentation - [x] Port back relevant commits to CE: gitlab-org/gitlab-ce!1822 ---- ## Mirror status on project homepage ![Screen_Shot_2015-11-12_at_12.48.15](/uploads/39666b0e4a14723407b0f66e2aaddb46/Screen_Shot_2015-11-12_at_12.48.15.png) ## Settings navigation item ![Screen_Shot_2015-11-10_at_17.32.27](/uploads/116ece85f65681bbd3c7c5e282ab3b3c/Screen_Shot_2015-11-10_at_17.32.27.png) ## Mirroring settings ![Screen_Shot_2015-11-17_at_11.17.17](/uploads/ff57c89831524435ec6a063c3c470203/Screen_Shot_2015-11-17_at_11.17.17.png) ## Activity feed with new "pushes" (mirror updates) ![activity_feed](/uploads/04754251f2142fd06b1fddc2aae45232/activity_feed.png) I have yet to decide on what user should be the author of these events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team. ## Warning that branch has diverged from upstream ![diverged](/uploads/ecf7ae6c5709f626c750695f45ca521a/diverged.png) ## Commits heading after failed update ![commits_failure](/uploads/d1b3e1f6796431c839ee9e2f67499283/commits_failure.png) Link send user to the mirroring settings if they are a project admin. ## Mirroring settings after failed update ![Screen_Shot_2015-11-12_at_12.43.09](/uploads/ece68d5021c9a4c374bf6d973cf9fafa/Screen_Shot_2015-11-12_at_12.43.09.png) ## New project page ![new_project](/uploads/296beb6c7faf390a9b7e1facc9c1d4d6/new_project.png) ## Import form after failed import (Screenshot outdated) ![new_import_failure](/uploads/ac0ebfc8ec23232603126fe0a6e10171/new_import_failure.png) Shown when the initial import of a project fails, not when an update of an existing project fails. cc @dzaporozhets @sytses @JobV See merge request !51
* \| \|	Merge remote-tracking branch 'origin/master' into ce-to-ee	Valery Sizov	2015-11-16	4	-0/+21
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'releases-feature'	Dmitriy Zaporozhets	2015-11-16	4	-0/+21
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Improve english textreleases-feature	Dmitriy Zaporozhets	2015-11-16	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Add release notes documentation	Dmitriy Zaporozhets	2015-11-12	4	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge remote-tracking branch 'ce/master' into ce-to-ee	Robert Speicher	2015-11-13	4	-0/+12
\|\ \ \ \| \|/ /
\| * \|	Add ignore white space option in merge request diff	Minsik Yoon	2015-11-13	4	-0/+12
\| \|/ \| \| \| \| \| \| \| \| \| \|	fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* \|	Link blog post	Sytse Sijbrandij	2015-11-07	1	-1/+2
\| \|
* \|	Merge remote-tracking branch 'origin/master' into ce_upsteram	Valery Sizov	2015-11-05	2	-3/+3
\|\ \ \| \|/
\| *	Gilab -> GitLab	Robert Schilling	2015-10-31	1	-2/+2
\| \|
\| *	Added missing period.	Derek Robati	2015-10-23	1	-1/+1
\| \|
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee	Dmitriy Zaporozhets	2015-09-16	8	-1/+31
\|\ \ \| \|/