22224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	345e32d332	Merge branch 'sstanovnik-openssh_fix' into 'master' ... Fix generating SSH key fingerprints with OpenSSH 6.8. Replaces https://github.com/gitlabhq/gitlabhq/pull/9008. Fixes gitlab-org/gitlab-ce#1289. cc @jacobvosmaer See merge request !519	2015-04-15 12:40:30 +00:00
Dmitriy Zaporozhets	4c26bcbec8	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 15:38:56 +03:00
Dmitriy Zaporozhets	d2a895dad8	Merge branch 'emailsonpush-replyto' into 'master' ... Set EmailsOnPush reply-to address to committer email when enabled. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227. See merge request !520	2015-04-15 12:37:51 +00:00
Dmitriy Zaporozhets	089f5b914e	Merge branch 'emailsonpush-hellip' into 'master' ... Don't use HTML ellipsis in EmailsOnPush subject truncated commit message. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2229. Since the page is encoded as UTF-8, we don't need HTML entities anymore and can just use the character. See merge request !521	2015-04-15 12:37:19 +00:00
Dmitriy Zaporozhets	4ab22a8c32	Merge branch 'ldap-block_auto_created_users' into 'master' ... Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522	2015-04-15 12:36:43 +00:00
Dmitriy Zaporozhets	2705500546	Merge branch 'fix-repository-rescue' into 'master' ... Don't crash when project repository doesn't exist. See merge request !524	2015-04-15 12:36:12 +00:00
Dmitriy Zaporozhets	fccc9454ff	Merge branch 'search-information-leak' into 'master' ... Don't leak existence of group or project via search. Fixes gitlab/gitlab-ee#266. See merge request !1762	2015-04-15 12:35:00 +00:00
Dmitriy Zaporozhets	1970dabea6	Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6 ... Update gemnasium-gitlab-service to 0.2.6	2015-04-15 15:33:09 +03:00
Dmitriy Zaporozhets	e3d818a4e8	Merge branch 'invitation' into 'master' ... Allow users to be invited. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058. The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.  Entering an email address that is not already a member will give you the option to invite them.  Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.  The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.  The invited user will receive an email with an "Accept invitation" link.  If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.  Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.  Accepting the invitation will redirect them to the group (or project) with an appropriate notice.  As currently, they will also receive this information by email.  At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.  The member row on the Members page will now have been updated with the new user account.  See merge request !500	2015-04-15 10:48:28 +00:00
Douwe Maan	3d0c0bd922	Add changelog item.	2015-04-15 12:45:29 +02:00
Dmitriy Zaporozhets	b75866120b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 12:56:25 +03:00
Douwe Maan	b409c37671	Merge branch 'fix-stuck-mr' into 'master' ... fix stuck mr If `locked?` & `locked_at.nil?` is nil return that the merge has been locked long enough and those are old merges stuck in locked state. Fixes #348. Related to 6487419364. Replaces !517. /cc @DouweM See merge request !526	2015-04-15 09:50:46 +00:00
Dmitriy Zaporozhets	3d9cbc5dcb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 12:44:59 +03:00
Dmitriy Zaporozhets	4efbf9b6f5	Merge branch 'revert-help-link' into 'master' ... Revert help link Revert for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/483 cc @douwe See merge request !1776	2015-04-15 09:44:30 +00:00
Dmitriy Zaporozhets	5d1ab47bd2	Revert help link tests removal ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-15 12:13:49 +03:00
Dmitriy Zaporozhets	400c9c5ae2	Revert "Removed help link from sidebar" ... This reverts commit 6fe26e3e46.	2015-04-15 12:12:58 +03:00
Douwe Maan	63b21945d2	Merge branch 'google-code-import' into 'master' ... Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions  ### Imported issue  See merge request !471	2015-04-15 06:53:42 +00:00
Dmitriy Zaporozhets	0a0d6050fc	Merge pull request #8905 from jasonblanchard/remove-truncation-milestone ... Remove truncation from issue titles on milestone page	2015-04-15 09:22:46 +03:00
Ben Bodenmiller	f517dd2606	fix stuck mr ... fixes #348. related to 6487419364.	2015-04-14 23:11:13 -07:00
Robert Schilling	61c79418c4	Merge branch 'fix-spinach-unsubscribe-mr-test' into 'master' ... Remove timing dependency on unsubscribe merge request test This test failed for me once. I am now on a mission to remove `sleep` from the spinach tests. See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara See merge request !523	2015-04-15 06:08:28 +00:00
Karen Carias	2b6231626a	Remove unnecessary file	2015-04-14 22:32:49 +00:00
Karen Carias	9a139fb92d	Add application section to SSH documentation	2015-04-14 22:31:26 +00:00
Douwe Maan	36b54fc04f	Don't crash when project repository doesn't exist.	2015-04-14 23:26:53 +02:00
Douwe Maan	9d00bb0896	Import Google Code issue assignee when mapped.	2015-04-14 23:22:14 +02:00
Douwe Maan	2f797a140b	Skip issue comment when its content, updates and attachments are empty.	2015-04-14 23:13:48 +02:00
Douwe Maan	88c2639356	Remove superfluous info from invite accepted/declined mails.	2015-04-14 23:06:21 +02:00
Karen Carias	cac6f0e20b	Add the text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration	2015-04-14 19:03:57 +00:00
Stan Hu	48efd65ff6	Remove timing dependency on test ... See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara	2015-04-14 10:34:48 -07:00
Douwe Maan	55d086ba08	Clarify config var and add to LDAP docs.	2015-04-14 18:17:46 +02:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
Dmitriy Zaporozhets	ac5af61499	Merge branch 'fix-ldap-migration' into 'master' ... Fix ldap migration We need different queries for MySQL and Postgres. See merge request !1771	2015-04-14 16:01:26 +00:00
Dmitriy Zaporozhets	afb43a8fcd	Use smae background for git clone text and project visibility ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 18:29:20 +03:00
Dmitriy Zaporozhets	09eea7ea84	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-14 18:13:38 +03:00
Dmitriy Zaporozhets	3cfcb635ea	Merge branch 'ui-improvements' into 'master' ... Ui improvements See merge request !1772	2015-04-14 15:13:11 +00:00
Douwe Maan	238e4f0295	Add config var to block auto-created LDAP users.	2015-04-14 17:09:05 +02:00
Douwe Maan	6157dad9ff	Merge branch 'master' into 'master' ... Fix error message This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback. See merge request !518	2015-04-14 15:08:58 +00:00
Douwe Maan	c43411e97a	Non-persisted users already have the identity by way of build_new_user.	2015-04-14 17:08:49 +02:00
Dmitriy Zaporozhets	5262ba3c9a	Default buttons should look the same on project page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 17:45:43 +03:00
Douwe Maan	5662b24132	Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.	2015-04-14 16:32:11 +02:00
Dmitriy Zaporozhets	dab1824679	Align project download button with others in sidebar on project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 17:08:01 +03:00
Douwe Maan	076494646d	Simplify regex.	2015-04-14 15:58:28 +02:00
Jacob Vosmaer	0b2670f82f	Remove unnecessary semicolons ... I could not help myself	2015-04-14 15:45:15 +02:00
Jacob Vosmaer	41a1cb88f4	Use different queries for MySQL and Postgres ... I could not find a query that worked on both; these two queries look very similar and seem to do the same thing.	2015-04-14 15:44:19 +02:00
Dmitriy Zaporozhets	0c6217e2dc	Add border radius and shadow to project avatar on project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 16:40:59 +03:00
Dmitriy Zaporozhets	29970204ea	Fix button overflow for branches/tags pages ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 16:26:47 +03:00
Jason Blanchard	f543f1c3dd	Remove truncation from issue titles on milestone page	2015-04-14 09:17:57 -04:00
Douwe Maan	cb5362e7ce	Follow newline guidelines.	2015-04-14 15:16:00 +02:00
Dmitriy Zaporozhets	bf7932bd06	Merge branch 'dir-traversal' into 'master' ... Fix directory traversal vulnerabilities Fixes gitlab/gitlab-ee#272. As @joern mentions: > This is not exploitable via the front-end nginx. But nevertheless this issue should be addressed. See merge request !1760	2015-04-14 13:07:27 +00:00
Douwe Maan	1abda4458e	"interpunction" -> "punctuation"	2015-04-14 14:59:10 +02:00
Douwe Maan	4c6ce0ef78	Move Specify user map button to paragraph.	2015-04-14 14:57:15 +02:00