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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Remove extraneous IGNORE_PARENTS from filter	Robert Speicher	2015-04-20	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix `user_can_reference_project?` check	Robert Speicher	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Escape title attributes in references	Robert Speicher	2015-04-20	6	-5/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Better guard against nil projects in ReferenceFilter	Robert Speicher	2015-04-20	2	-2/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Minor doc fix	Robert Speicher	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Fix Issue and ExternalIssue reference specs	Robert Speicher	2015-04-20	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	DRY up reference filters using ReferenceFilter base class	Robert Speicher	2015-04-20	10	-320/+55
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a ReferenceFilter base class	Robert Speicher	2015-04-20	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow for the removal of a lot of duplication from the reference filters.
\| * \| \| \| \| \| \|	Fix `user_can_reference_group?` check	Robert Speicher	2015-04-20	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add permission check to ReferenceExtractor's user mentions	Robert Speicher	2015-04-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename `user_can_read_group?` to `user_can_reference_group?`	Robert Speicher	2015-04-20	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Check for project read permissions in cross-references	Robert Speicher	2015-04-20	1	-3/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add current_user to filter context	Robert Speicher	2015-04-20	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove Gitlab::Markdown from Gitlab::ReferenceExtractor	Robert Speicher	2015-04-20	1	-2/+66
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add permission checking to UserReferenceFilter	Robert Speicher	2015-04-20	1	-3/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add name-based referencing to LabelReferenceFilter	Robert Speicher	2015-04-20	1	-8/+35
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Run SanitizationFilter before our reference filters	Robert Speicher	2015-04-20	1	-2/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make CommitRange and Snippets cross-referable	Robert Speicher	2015-04-20	1	-12/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reference filters :sparkles:	Robert Speicher	2015-04-20	10	-283/+928
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users.
* \| \| \| \| \| \|	Don't autolink masked imported email addresses.	Douwe Maan	2015-04-21	1	-1/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix rendering of deleted blocking/blocked-on statuses.	Douwe Maan	2015-04-21	1	-10/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Import "Comment #10" as "Comment 10" to not incorrectly reference issue.	Douwe Maan	2015-04-21	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Get imported links to render correctly by not escaping all special chars.	Douwe Maan	2015-04-21	1	-12/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add "imported from Google Code" to imported issues.	Douwe Maan	2015-04-21	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Revert disallowing usernames to end in period.revert-username-period	Douwe Maan	2015-04-20	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-label-color' into 'master'	Dmitriy Zaporozhets	2015-04-20	1	-16/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Parse GFM references after sanitizing Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`. See #2188. See merge request !1745
\| * \| \| \| \| \|	Fix GFM extractions	Vinnie Okada	2015-04-17	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract and re-insert links after sanitizing user markup.
\| * \| \| \| \| \|	Parse GFM references after sanitizing	Vinnie Okada	2015-03-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.
* \| \| \| \| \| \|	Merge branch 'google-code-import-performance' into 'master'	Dmitriy Zaporozhets	2015-04-17	2	-69/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease memory use and increase performance of Google Code importer. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2241. See merge request !536
\| * \| \| \| \| \| \|	Decrease memory use and increase performance of Google Code importer.	Douwe Maan	2015-04-17	1	-47/+38
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move import data out of project so it doesn't take ages to load.	Douwe Maan	2015-04-17	2	-22/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add new rake task	Vinnie Okada	2015-04-15	1	-0/+17
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a task that checks repository integrity with `git fsck`.
* \| \| \| \| \| \|	Make sure user has access to namespace in import tests.	Douwe Maan	2015-04-15	2	-32/+37
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sstanovnik-openssh_fix' into 'master'	Dmitriy Zaporozhets	2015-04-15	1	-0/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Simplify regex.sstanovnik-openssh_fix	Douwe Maan	2015-04-14	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor key fingerprint generation.	Douwe Maan	2015-04-14	1	-0/+55
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ldap-block_auto_created_users' into 'master'	Dmitriy Zaporozhets	2015-04-15	2	-2/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522
\| * \| \| \| \| \| \| \|	Add config var to block auto-created LDAP users.	Douwe Maan	2015-04-14	2	-2/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Non-persisted users already have the identity by way of build_new_user.	Douwe Maan	2015-04-14	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'invitation' into 'master'	Dmitriy Zaporozhets	2015-04-15	2	-7/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Track who created a group or project member.	Douwe Maan	2015-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use through-relation instead of manually mapping.	Douwe Maan	2015-04-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename manage_group ability to admin_group for consistency with project.	Douwe Maan	2015-04-14	2	-4/+4
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'google-code-import' into 'master'	Douwe Maan	2015-04-15	4	-0/+502
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Import Google Code issue assignee when mapped.google-code-import	Douwe Maan	2015-04-14	1	-0/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Skip issue comment when its content, updates and attachments are empty.	Douwe Maan	2015-04-14	1	-39/+61
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow user map to be specified.	Douwe Maan	2015-04-14	4	-17/+56
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add comment number to imported Google Code comments.	Douwe Maan	2015-04-14	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove author link since all code.google.com links will be shut down.	Douwe Maan	2015-04-14	1	-8/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show Google Code image attachments inline.	Douwe Maan	2015-04-04	1	-2/+6
\| \| \| \| \| \| \| \| \|