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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentions	Douwe Maan	2015-04-21	1	-2/+2
\| \| \| \|	a user mention.
*	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
\| \| \| \|
\| * \| \|	Mask owner email when updated.	Douwe Maan	2015-04-03	1	-14/+10
\| \| \| \|
\| * \| \|	Allow projects to be imported from Google Code.	Douwe Maan	2015-04-03	4	-0/+429
\| \| \| \|
* \| \| \|	Merge branch 'ldap_migration'	Dmitriy Zaporozhets	2015-04-13	2	-3/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
\| * \| \| \|	Remove special cases for the 'ldap' provider	Jacob Vosmaer	2015-04-13	2	-3/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'reference-access-control' into 'master'	Dmitriy Zaporozhets	2015-04-13	3	-65/+66
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
\| * \| \| \| \|	Refactor ClosingIssueExtractor.	Douwe Maan	2015-04-03	1	-12/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor ReferenceExtractor.	Douwe Maan	2015-04-03	1	-29/+28
\| \| \| \| \| \|
\| * \| \| \| \|	Don't require user to every gfm call.	Douwe Maan	2015-04-03	1	-21/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Fix errors.	Douwe Maan	2015-04-02	2	-20/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Only allow users to cross-reference and close issues they have access to.	Douwe Maan	2015-04-02	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Don't allow full access to guests in ReferenceExtractor	Douwe Maan	2015-04-02	1	-3/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Refactor Mentionable mentioned users to use ReferenceExtractor.	Douwe Maan	2015-04-02	1	-2/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Only allow user to reference objects they have access to.	Douwe Maan	2015-04-02	2	-21/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Slightly refactor ReferenceExtractor.	Douwe Maan	2015-04-02	2	-38/+38
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'skip-email-reconfirmation' into 'master'	Dmitriy Zaporozhets	2015-04-13	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip email confirmation when set by admin or via LDAP. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203. See merge request !494
\| * \| \| \| \| \|	Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation	Douwe Maan	2015-04-06	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'shell-version-warning' into 'master'	Dmitriy Zaporozhets	2015-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495
\| * \| \| \| \| \| \|	Warn when gitlab-shell version doesn't match requirement.shell-version-warning	Douwe Maan	2015-04-06	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #9114 from dreis2211/dreis2211-patch-1	Dmitriy Zaporozhets	2015-04-10	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Include creator_id in project info of API
\| * \| \| \| \| \|	Include creator_id in project info of API	Christoph Dreis	2015-04-10	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-revert-preload-lib' into 'master'	Dmitriy Zaporozhets	2015-04-10	6	-1/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Preload lib/" This reverts commit 5511a731bcc05034abacd4ec01ff7d5a2a3b89d3. The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c809662980041fce66d182489c025475e7a7, but this got left behind. I don't fully understand the reasoning behind it so if I'm wrong, please tell me. My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point. If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development. See merge request !1758
\| * \| \| \| \| \| \|	Move lib/gitlab/contributors to its correct path	Robert Speicher	2015-04-09	1	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add autoloads for lib/gitlab/satellite/files/*	Robert Speicher	2015-04-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These files don't match their naming convention, but for organizational purposes it makes sense.