1697 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	7915e74d3c	Merge branch 'google-code-fixes' into 'master' ... Fix some issues with Google Code importer Thanks, @mrtux, for reporting all of these. See merge request !551	2015-04-21 15:47:45 +03:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets	34192f2cf9	Merge branch 'rs-issue-2212' into 'master' ... Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765	2015-04-21 15:47:23 +03:00
Dmitriy Zaporozhets	407489d606	Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master' ... Remove access control for uploaded images to fix broken images in emails Replaces !530. > This MR removes the access control for uploaded images. This is needed to display the images in emails again. > > The previous solution to base64 encode the images had to be reverted, because not all email clients supported it. > > If possible this should go into the 7.10 release. See merge request !533	2015-04-20 12:48:25 +03:00
Dmitriy Zaporozhets	8b4b687d44	Merge branch 'google-code-import-performance' into 'master' ... 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	2015-04-17 17:34:48 +03:00
Dmitriy Zaporozhets	cc41381be4	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 15:41:36 +03: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	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	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
Douwe Maan	36b54fc04f	Don't crash when project repository doesn't exist.	2015-04-14 23:26:53 +02: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	dba63d667d	Allow user map to be specified.	2015-04-14 14:50:56 +02:00
Senorsen	7b28218f96	Allow user to choose which email to be public ... This commit allows user to show one of their emails in profile page, or don't show email in this page.	2015-04-14 19:42:48 +08:00
Douwe Maan	5e2f25c32e	Add explanation to HelpController#clean_path_info.	2015-04-14 13:07:15 +02:00
Douwe Maan	0013ea5130	Remove duplication between Group and ProjectMember.	2015-04-14 12:41:19 +02:00
Douwe Maan	a8b462bbfe	Clear up InvitesController member lookup logic.	2015-04-14 12:25:47 +02:00
Douwe Maan	1c0b58a799	Remove duplication from InvitesController.	2015-04-14 12:25:38 +02:00
Douwe Maan	1b5c483d89	Consistently use "invitation" rather than "invite" in text.	2015-04-14 12:25:16 +02:00
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	2a45eb6a91	Use notice flash type rather than nonexistent info.	2015-04-14 12:08:11 +02:00
Douwe Maan	453340d449	Let membership invitations be resent.	2015-04-14 12:08:10 +02:00
Douwe Maan	87dd3f215f	Let members be invited from Add members pane.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +02:00
Douwe Maan	90dafe31c4	Only show invited users to people who can admin group.	2015-04-14 12:07:33 +02:00
Douwe Maan	cee98f2247	Reference project members by id instead of user_id.	2015-04-14 12:06:43 +02:00
Douwe Maan	2b2bd402dc	Track who created a group or project member.	2015-04-14 12:06:42 +02:00
Douwe Maan	ff3caad4ca	Rename manage_group ability to admin_group for consistency with project.	2015-04-14 12:05:49 +02:00
Dmitriy Zaporozhets	6e88d9335b	Merge branch 'skip-email-reconfirmation' into 'master' ... 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	2015-04-13 13:44:56 +00:00
Dmitriy Zaporozhets	9c14ed0689	Merge branch 'public-deploy-keys' into 'master' ... Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings:  The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index:  Admin detail page:  Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469	2015-04-13 09:08:13 +00:00
Dmitriy Zaporozhets	f244914402	Merge branch 'regex-start-of-string' into 'master' ... Fix persistent XSS vulnerability around profile website URLs. Fixes gitlab/gitlab-ee#268 See merge request !1761	2015-04-12 07:36:40 +00:00
Dmitriy Zaporozhets	9df1476305	Merge branch 'rs-issue-1942' into 'master' ... Upon successful login, clear `reset_password_token` field Closes #1942 See merge request !1757	2015-04-12 07:33:06 +00:00
Douwe Maan	abc06c2531	Don't leak existence of group or project via search.	2015-04-10 18:40:39 +02:00
Douwe Maan	1f813024ba	Don't leak existence of project via search autocomplete.	2015-04-10 18:40:39 +02:00
Douwe Maan	0ece6bd828	Use \A and \z in regexes instead of ^ and $.	2015-04-10 18:31:07 +02:00
Douwe Maan	edd05fc48c	Fix directory traversal vulnerability around help pages.	2015-04-10 18:18:37 +02:00
Robert Speicher	57afaf9d92	Upon successful login, clear reset_password_token field ... Closes #1942	2015-04-08 16:06:56 -04:00
Douwe Maan	f3f856029b	Merge branch 'fix-slashes-in-wiki-urls' into 'master' ... Fix bug where Wiki pages that include a '/' were no longer accessible ### What does this MR do? This MR fixes a regression that caused Wiki pages that included a '/' to no longer be accessible. ### Are there points in the code the reviewer needs to double check? Are there cases that `wiki_helper.rb` doesn't handle? ### Why was this MR needed? The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a model ID to be escaped automatically. We can no longer use the built-in the URL helpers to generate the links for Wiki pages if we want to maintain support for slashes. There is no option to tell the formatter otherwise: http://stackoverflow.com/questions/25031791/rails-4-1-2-to-param-escapes-slashes-and-breaks-app The Rails code in question is here: https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/journey/visitors.rb#L159 ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1363 See merge request !502	2015-04-08 16:30:23 +00:00
Dmitriy Zaporozhets	4902dca966	Merge branch 'rs-issue-2152' into 'master' ... Render a 404 when RefsController#logs_tree gets an HTML request Fixes #2152 See merge request !1748	2015-04-08 11:11:38 +00:00
Stan Hu	3143edfea6	Fix bug where Wiki pages that include a '/' were no longer accessible ... Closes #1363	2015-04-07 09:10:11 -07:00
Robert Speicher	167a6b9eef	Render a 404 when RefsController#logs_tree gets an HTML request ... Fixes #2152	2015-04-06 23:08:28 -04:00
Douwe Maan	e69e430ce7	Allow projects to be imported into namespaces user is master of.	2015-04-06 14:50:43 +02:00
Douwe Maan	f2af30f195	Skip email confirmation when set by admin or via LDAP.	2015-04-06 13:27:19 +02:00
Douwe Maan	45ca39e81b	Merge remote-tracking branch 'github.com/master'	2015-04-04 14:23:32 +02:00
Douwe Maan	17e2310878	Add instructions to Google Code import page.	2015-04-03 16:02:39 +02:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00
Douwe Maan	ed097df627	Clean up code.	2015-04-03 12:28:47 +02:00
Douwe Maan	edc4a56d26	Allow admin to create public deploy keys that are accessible to any project.	2015-04-03 12:23:20 +02:00
Sullivan SENECHALandSullivan SENECHAL	d365004e68	Fix and improve help rendering	2015-04-03 11:56:50 +02:00
Douwe Maan	317206300d	Merge branch 'configurable-attachment-size' into 'master' ... Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407	2015-04-03 08:47:55 +00:00