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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Fix and improve help rendering"	Robert Speicher	2015-04-15	2	-24/+8
\| \| \| \|	This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-15	53	-180/+714
\|\
\| *	Merge branch 'sstanovnik-openssh_fix' into 'master'	Dmitriy Zaporozhets	2015-04-15	1	-16/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Refactor key fingerprint generation.	Douwe Maan	2015-04-14	1	-40/+4
\| \| \|
\| \| *	The new fingerprint format wis incompatible with the previous regex.	Sašo Stanovnik	2015-03-24	1	-4/+11
\| \| \|
\| \| *	Use 2 spaces for indentation, not 4.	Sašo Stanovnik	2015-03-24	1	-1/+1
\| \| \|
\| \| *	Fixed generating SSH key fingerprints in OpenSSH 6.8.	Sašo Stanovnik	2015-03-24	1	-1/+18
\| \| \|
\| * \|	Merge branch 'emailsonpush-replyto' into 'master'	Dmitriy Zaporozhets	2015-04-15	2	-12/+24
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \|	Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replyto	Douwe Maan	2015-04-14	2	-12/+24
\| \| \| \|
\| * \| \|	Merge branch 'emailsonpush-hellip' into 'master'	Dmitriy Zaporozhets	2015-04-15	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \|	Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellip	Douwe Maan	2015-04-14	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-repository-rescue' into 'master'	Dmitriy Zaporozhets	2015-04-15	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't crash when project repository doesn't exist. See merge request !524
\| \| * \| \| \|	Don't crash when project repository doesn't exist.fix-repository-rescue	Douwe Maan	2015-04-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'invitation' into 'master'	Dmitriy Zaporozhets	2015-04-15	49	-149/+683
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) 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. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) 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. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) 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. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
\| \| * \| \| \| \|	Remove superfluous info from invite accepted/declined mails.invitation	Douwe Maan	2015-04-14	8	-12/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add spinach tests around accepting and declining invitations.	Douwe Maan	2015-04-14	1	-0/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Follow newline guidelines.	Douwe Maan	2015-04-14	6	-4/+25
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove duplication between Group and ProjectMember.	Douwe Maan	2015-04-14	4	-41/+38
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Clear up InvitesController member lookup logic.	Douwe Maan	2015-04-14	1	-5/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove duplication from InvitesController.	Douwe Maan	2015-04-14	1	-25/+22
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Consistently use "invitation" rather than "invite" in text.	Douwe Maan	2015-04-14	7	-20/+24
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Let invites be declined.	Douwe Maan	2015-04-14	17	-1/+113
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use "Sign out" instead of "Logout" for consistency.	Douwe Maan	2015-04-14	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Correctly import invited members.	Douwe Maan	2015-04-14	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use notice flash type rather than nonexistent info.	Douwe Maan	2015-04-14	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Let membership invitations be resent.	Douwe Maan	2015-04-14	4	-0/+32
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Let members be invited from Add members pane.	Douwe Maan	2015-04-14	8	-25/+72
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add emails around invitation.	Douwe Maan	2015-04-14	5	-4/+82
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add invites controller.	Douwe Maan	2015-04-14	12	-2/+143
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Only show invited users to people who can admin group.	Douwe Maan	2015-04-14	2	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Correctly render invite members without user.	Douwe Maan	2015-04-14	7	-33/+74
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Reference project members by id instead of user_id.	Douwe Maan	2015-04-14	3	-9/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add invite logic to Member.	Douwe Maan	2015-04-14	3	-38/+100
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Track who created a group or project member.	Douwe Maan	2015-04-14	9	-28/+34
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Rename manage_group ability to admin_group for consistency with project.	Douwe Maan	2015-04-14	9	-14/+14
\| \| \| \|_\|/ / \| \| \|/\| \| \|
* \| \| \| \| \|	Merge branch 'search-information-leak' into 'master'	Dmitriy Zaporozhets	2015-04-15	1	-5/+17
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't leak existence of group or project via search. Fixes gitlab/gitlab-ee#266. See merge request !1762
\| * \| \| \| \|	Don't leak existence of group or project via search.	Douwe Maan	2015-04-10	1	-4/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Don't leak existence of project via search autocomplete.	Douwe Maan	2015-04-10	1	-1/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-15	10	-15/+276
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'fix-stuck-mr' into 'master'	Douwe Maan	2015-04-15	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 6487419364fa9c179e24028d85b2be10d574067f. Replaces !517. /cc @DouweM See merge request !526
\| \| * \| \| \| \| \|	fix stuck mr	Ben Bodenmiller	2015-04-14	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #348. related to 6487419364fa9c179e24028d85b2be10d574067f.
\| * \| \| \| \| \| \|	Merge branch 'google-code-import' into 'master'	Douwe Maan	2015-04-15	9	-14/+273
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @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 ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
\| \| * \| \| \| \| \|	"interpunction" -> "punctuation"	Douwe Maan	2015-04-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Move Specify user map button to paragraph.	Douwe Maan	2015-04-14	1	-1/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Allow user map to be specified.	Douwe Maan	2015-04-14	4	-4/+82
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add instructions to Google Code import page.	Douwe Maan	2015-04-03	2	-13/+47
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Allow projects to be imported from Google Code.	Douwe Maan	2015-04-03	8	-14/+158
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-15	1	-4/+4
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #8905 from jasonblanchard/remove-truncation-milestone	Dmitriy Zaporozhets	2015-04-15	1	-4/+4
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Remove truncation from issue titles on milestone page
\| \| * \| \| \| \| \| \|	Remove truncation from issue titles on milestone page	Jason Blanchard	2015-04-14	1	-4/+4
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|