18049 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	5fb5fd253a	Merge branch 'nicer-merge-conflicts-widget' into 'master' ... Split merge conflict messages on 2 lines Before  After  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1107	2015-08-06 20:35:36 +00:00
Dmitriy Zaporozhets	c5eb2977d7	Merge branch 'add-current-user-to-autocomplete' into 'master' ... Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100	2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets	2c46cf084b	Merge branch 'fix-namespace-move-dir' into 'master' ... Ensure old namespace directory exists before moving it Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #983 See merge request !1101	2015-08-06 16:09:11 +00:00
Dmitriy Zaporozhets	dcb0bf0df5	Merge branch 'report-spam'	2015-08-06 18:07:36 +02:00
Dmitriy Zaporozhets	69f0defc59	Merge branch 'project-name' into 'master' ... Add project name to project head I felt that something was missing between the avatar and description.  cc @dzaporozhets See merge request !1106	2015-08-06 15:53:22 +00:00
Dmitriy Zaporozhets	485b9efe9f	Remove trailing lines ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 17:27:48 +02:00
Dmitriy Zaporozhets	ab6aa8a48b	Split merge conflict messages on 2 lines ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 17:22:45 +02:00
Douwe Maan	674e1c7458	Fix spec	2015-08-06 17:15:37 +02:00
Dmitriy Zaporozhets	02c4a0cc73	Add tests for abuse report feature ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 16:57:04 +02:00
Dmitriy Zaporozhets	ed7a8c9221	Improve wording in abuse report form ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 15:15:17 +02:00
Dmitriy Zaporozhets	4ba2698810	Remove selectbox from abuse form. Added pagination in admin area ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 15:13:47 +02:00
Douwe Maan	e2b4f13b9b	Add project name to project head	2015-08-06 15:10:51 +02:00
Dmitriy Zaporozhets	7a9d432cdb	Add abuse report management in admin area ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 15:08:22 +02:00
Dmitriy Zaporozhets	cba7f20dc8	Allow users to send abuse reports ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 14:03:27 +02:00
Dmitriy Zaporozhets	d044c14290	Ensure old namespace directory exists before moving it ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 12:31:24 +02:00
Valery Sizov	912233ecd3	Merge branch 'update_changelog_from_stable' into 'master' ... update chnagelog See merge request !1096	2015-08-06 09:40:01 +00:00
Douwe Maan	fff36a8b89	Merge branch 'fix-link-to-guide' into 'master' ... Replace relative url with full path, remove old reference for indexes See merge request !1091	2015-08-06 09:12:51 +00:00
Douwe Maan	c6cbee846c	Merge branch 'remove-email-from-published-keys' into 'master' ... 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	2015-08-06 09:05:15 +00:00
Dmitriy Zaporozhets	4b3b286eef	Merge branch 'tree-author-at-end' into 'master' ... 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	2015-08-06 08:59:25 +00:00
Douwe Maan	863f61343a	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master' ... Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084	2015-08-06 08:29:18 +00:00
Stan Hu	70f5291808	Always add current user to autocomplete controller to support filter by "Me" ... Partial fix #2202	2015-08-06 00:46:14 -07:00
Achilleas Pipinellis	ce47dd4bb0	Update stable branch in installation documentation. Fixes #2191	2015-08-05 21:09:24 +03:00
Dmitriy Zaporozhets	957e849f41	Merge branch 'drop-satellites'	2015-08-05 15:40:14 +02:00
Dmitriy Zaporozhets	6b9dbe9f5a	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-05 14:51:24 +02:00
Dmitriy Zaporozhets	58c0c86dbd	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2015-08-05 14:50:32 +02:00
Dmitriy Zaporozhets	7538be71e0	Merge branch 'update_release_doc' into 'master' ... update release doc See merge request !1097	2015-08-05 12:42:03 +00:00
Job van der Voort	72943ee7e2	Merge branch 'server-note' into 'master' ... Added note about changing servers Because of tweet https://twitter.com/elraro21/status/628650106850516992 See merge request !1919	2015-08-05 12:39:16 +00:00
Valery Sizov	a567dd20d4	update release doc	2015-08-05 14:11:25 +03:00
Valery Sizov	fbbfa774c2	update chnagelog	2015-08-05 13:42:27 +03:00
Kamil Trzciński	caf4c0dd87	Merge branch 'ci-skipped-status' into 'master' ... 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	2015-08-05 10:09:07 +00:00
Sytse Sijbrandij	764124c380	Merge branch 'revert_touch' into 'master' ... Revert "Update noteable after a new note is added" This reverts commit fbdaf0e2a5. https://gitlab.com/gitlab-org/gitlab-ce/issues/2027 See merge request !1094	2015-08-05 09:57:27 +00:00
Dmitriy Zaporozhets	1cb8588c66	Remove satellites from requirements docs and add CHANGELOG ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-05 11:49:02 +02:00
Dmitriy Zaporozhets	c8d00787c2	Merge branch 'add-resend-confirm-email-admin-page' into 'master' ... 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  ### What are the relevant issue numbers? * Closes #2116 * Closes https://github.com/gitlabhq/gitlabhq/issues/9502 See merge request !1067	2015-08-05 09:43:03 +00:00
Dmitriy Zaporozhets	46a84d8013	Merge branch 'rs-issue-2135' into 'master' ... Update docs for Ruby MRI 2.1 requirement Addresses #2135 See merge request !1089	2015-08-05 09:21:03 +00:00
Dmitriy Zaporozhets	734f97ae11	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-08-05 11:19:01 +02:00
Dmitriy Zaporozhets	7b4225bdb2	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-08-05 11:18:47 +02:00
Dmitriy Zaporozhets	6caa03d422	Merge remote-tracking branch 'public/project-buttons'	2015-08-05 11:18:28 +02:00
Dmitriy Zaporozhets	ab8c71de4e	Fix merge request creation without branch selected ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-05 11:03:41 +02:00
Valery Sizov	6353ca9ae8	Revert "Update noteable after a new note is added" ... This reverts commit fbdaf0e2a5.	2015-08-05 12:00:12 +03:00
Stan Hu	0c1ccda43f	Add "Confirm user" button in user admin page ... Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502	2015-08-05 00:35:53 -07:00
Robert Schilling	96bb42e5a7	Merge branch 'semaphore-shield' into 'master' ... 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	2015-08-05 07:04:00 +00:00
Jeroen van Baarsen	9076b5026b	Update the Semaphore badge to the shield badge type ... **Why is this needed?** It just does look better in the Readme :-) Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-08-05 08:07:35 +02:00
Achilleas Pipinellis	c90e592e91	Replace relative url with full path, remove old reference for indexes ... Closes #2176 (gitlab.com)	2015-08-05 08:38:40 +03:00
Sven Strickroth	ee0fc2c3ad	Put author name at the end of a tree row ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2015-08-05 00:12:13 +02:00
Achilleas Pipinellis	4c9ba632e9	Merge branch 'master' into 'master' ... 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	2015-08-04 21:56:27 +00:00
karen Carias	b83b333217	added note about changing servers	2015-08-04 14:51:08 -07:00
Robert Speicher	f9d71c4b91	Update docs for Ruby MRI 2.1 requirement	2015-08-04 17:07:12 -04:00
Robert Speicher	e9bbea7048	Don't hide the clone holder for an empty project	2015-08-04 16:58:14 -04:00
Dmitriy Zaporozhets	44ac823e59	Improve tests to use real branches in merge requests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-04 17:20:26 +02:00
Kamil Trzcinski	427b5df260	Added support for CI skipped status	2015-08-04 16:47:19 +02:00