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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into merge-notifsmerge-notifs	Douwe Maan	2015-08-06	159	-1591/+1715
\|\
\| *	Merge branch 'fix-link-to-guide' into 'master'	Douwe Maan	2015-08-06	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace relative url with full path, remove old reference for indexes See merge request !1091
\| \| *	Replace relative url with full path, remove old reference for indexes	Achilleas Pipinellis	2015-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #2176 (gitlab.com)
\| * \|	Merge branch 'remove-email-from-published-keys' into 'master'	Douwe Maan	2015-08-06	6	-7/+33
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only publish ssh key-type and key Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys) To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded. See merge request !850
\| \| * \|	Only publish ssh key-type and key	Zeger-Jan van de Weg	2015-08-04	6	-7/+33
\| \| \| \|
\| * \| \|	Merge branch 'tree-author-at-end' into 'master'	Dmitriy Zaporozhets	2015-08-06	2	-6/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put author name at the end of a tree row Put author name at the end of a tree row as the commit message is more important than the author name. See merge request !579
\| \| * \| \|	Put author name at the end of a tree row	Sven Strickroth	2015-08-05	2	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sven Strickroth <email@cs-ware.de>
\| * \| \| \|	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'	Douwe Maan	2015-08-06	5	-4/+37
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
\| \| * \| \| \|	Fix "Network" and "Graphs" pages for branches with encoded slashes	Stan Hu	2015-08-02	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1359
\| \| * \| \| \|	Fix errors deleting and creating branches with encoded slashes	Stan Hu	2015-08-01	3	-3/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1804
\| * \| \| \| \|	Update stable branch in installation documentation. Fixes #2191	Achilleas Pipinellis	2015-08-05	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	68	-1069/+288
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Remove satellites from requirements docs and add CHANGELOGdrop-satellites	Dmitriy Zaporozhets	2015-08-05	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Fix merge request creation without branch selected	Dmitriy Zaporozhets	2015-08-05	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Improve tests to use real branches in merge requests	Dmitriy Zaporozhets	2015-08-04	4	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	220	-1477/+2983
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix merge api and spec	Dmitriy Zaporozhets	2015-08-04	2	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Remove satellites mention from architecture doc	Dmitriy Zaporozhets	2015-07-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Use real branches from test repo	Dmitriy Zaporozhets	2015-07-16	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix some of tests	Dmitriy Zaporozhets	2015-07-16	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix refresh service	Dmitriy Zaporozhets	2015-07-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ↵	Dmitriy Zaporozhets	2015-07-16	2	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reload with full diff link Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Huge refactoring for accepting merge requests	Dmitriy Zaporozhets	2015-07-16	20	-133/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Refactor compare and fetch logic	Dmitriy Zaporozhets	2015-07-15	8	-51/+36
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Implement update of ref when merge request code is reloaded	Dmitriy Zaporozhets	2015-07-15	1	-9/+18
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Implement merge from forks without satellites	Dmitriy Zaporozhets	2015-07-15	7	-22/+62
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix application initialize	Dmitriy Zaporozhets	2015-07-15	2	-1/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	35	-844/+18
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fetch reference from fork repo when create merge request	Dmitriy Zaporozhets	2015-07-15	2	-0/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-05	2	-0/+2
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'update_release_doc' into 'master'	Dmitriy Zaporozhets	2015-08-05	2	-0/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update release doc See merge request !1097
\| \| \| * \| \| \| \| \| \|	update release doc	Valery Sizov	2015-08-05	2	-0/+2
\| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-08-05	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'server-note' into 'master'	Job van der Voort	2015-08-05	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added note about changing servers Because of tweet https://twitter.com/elraro21/status/628650106850516992 See merge request !1919
\| \| \| * \| \| \| \| \| \|	added note about changing servers	karen Carias	2015-08-04	1	-1/+1
\| \| \| \|/ / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'ci-skipped-status' into 'master'	Kamil Trzciński	2015-08-05	5	-2/+14
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added support for CI skipped status This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216 See merge request !1073
\| \| * \| \| \| \| \| \| \|	Added support for CI skipped statusci-skipped-status	Kamil Trzcinski	2015-08-04	5	-2/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'revert_touch' into 'master'	Sytse Sijbrandij	2015-08-05	3	-6/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Update noteable after a new note is added" This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78. https://gitlab.com/gitlab-org/gitlab-ce/issues/2027 See merge request !1094
\| \| * \| \| \| \| \| \| \| \|	Revert "Update noteable after a new note is added"revert_touch	Valery Sizov	2015-08-05	3	-6/+2
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
\| * \| \| \| \| \| \| \| \|	Merge branch 'add-resend-confirm-email-admin-page' into 'master'	Dmitriy Zaporozhets	2015-08-05	6	-0/+47
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "Confirm user" button to admin page ### What does this MR do? This MR adds a "Confirm user" to the admin user page. ### Why was this MR needed? There is no way for an admin to force a user confirmation. Some users create users in the API and then don't have a way to force the user into a confirmed state. Originally, I attempted to add a link to allow the admin to resend a confirmation e-mail. But that may not be helpful because a user can be in the unconfirmed state with no `unconfirmed_email` set. ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0571b1e27597289b760a72948ba869e5/image.png) ### What are the relevant issue numbers? * Closes #2116 * Closes https://github.com/gitlabhq/gitlabhq/issues/9502 See merge request !1067
\| \| * \| \| \| \| \| \| \| \|	Add "Confirm user" button in user admin page	Stan Hu	2015-08-05	6	-0/+47
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
\| * \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-2135' into 'master'	Dmitriy Zaporozhets	2015-08-05	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs for Ruby MRI 2.1 requirement Addresses #2135 See merge request !1089
\| \| * \| \| \| \| \| \| \|	Update docs for Ruby MRI 2.1 requirementrs-issue-2135	Robert Speicher	2015-08-04	2	-4/+4
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-05	2	-4/+4
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'semaphore-shield' into 'master'	Robert Schilling	2015-08-05	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the Semaphore badge to the shield badge type Why is this needed? It just does look better in the Readme :-) See merge request !1092
\| \| \| * \| \| \| \| \| \|	Update the Semaphore badge to the shield badge type	Jeroen van Baarsen	2015-08-05	1	-2/+2
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why is this needed? It just does look better in the Readme :-) Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| \| * \| \| \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2015-08-04	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updated restore docs wrt backup location [ci skip] Made sure to point out that the restore location can be overwritten by an entry in the config. See merge request !1030
\| \| \| * \| \| \| \| \|	fixed typo in backup_restore.md	Mike C	2015-07-30	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	updated restore docs wrt backup location [ci skip]	mchristof	2015-07-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made sure to point out that the restore location can be overwritten by an entry in the config.
\| * \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-05	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /