1930 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	c1a5f4710a	Merge pull request #8645 from chulkilee/hipchat-api-version ... Add api version property on hipchat service	2015-04-27 17:07:54 +03:00
Valery Sizov	bc9ba5237c	Revert "Added X-GitLab-Event header for web hooks" ... This reverts commit 548f182814.	2015-04-27 16:29:31 +03:00
Chulki Lee	57c724558d	Add api version property on hipchat service	2015-04-27 21:14:04 +09:00
Dmitriy Zaporozhets	278c3ba401	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets	2cbdfbfd1e	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets	38e2ae5ae0	Merge pull request #8644 from Bugagazavr/hook-events ... Add X-GitLab-Event header for web hooks	2015-04-27 11:22:33 +03:00
Dominik Sander	3c3b43b0a0	Add notify and color options to HipchatService ... When notify is set to true send messages will trigger a notification for all room members. Color changes the background color of the message.	2015-04-26 22:00:51 +02:00
Vinnie Okada	bd557e4b64	Add new admin settings ... Add new global application settings for default project and snippet visibility levels.	2015-04-26 07:48:19 -06:00
Robert Speicher	aa9435cddb	Remove duplicate settings for default_url_options ... Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269	2015-04-25 19:46:04 -04:00
bugagazavr	548f182814	Added X-GitLab-Event header for web hooks	2015-04-25 21:31:52 +03:00
Douwe Maan	c2f11f3209	Get Gitorious importer to work again.	2015-04-24 23:30:12 +02:00
Douwe Maan	439b9f50af	Merge branch 'fix-slack-channel-in-admin-settings' into 'master' ... Fix bug where Slack service channel was not saved in admin template settings Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181 Closes #1501 See merge request !574	2015-04-24 16:32:09 +00:00
Robert Speicher	ea9089647c	Merge branch 'rs-simplify-uploads-controller' into 'master' ... Simplify the `skip_before_action` logic for UploadsController See merge request !547	2015-04-24 16:26:32 +00:00
Stan Hu	2f04599751	Fix bug where Slack service channel was not saved in admin template settings. ... Consolidate allowed parameters in one place to avoid these kinds of bugs in the future. Closes https://github.com/gitlabhq/gitlabhq/issues/9181	2015-04-24 08:33:24 -07:00
Douwe Maan	27af24c1c9	No longer needed to pass project argument to commit methods.	2015-04-24 12:29:36 +02:00
Douwe Maan	8ed7ac9d44	Use project.commit convenience method.	2015-04-24 12:29:36 +02:00
Robert Speicher	10053b173d	Simplify the skip_before_filter logic for UploadsController	2015-04-23 13:15:47 -04:00
Douwe Maan	a6dfd065ca	Add atom feed for project activity.	2015-04-23 17:11:39 +02:00
Dmitriy Zaporozhets	d4fb062d97	Merge branch 'sign-out-to-sign-in' into 'master' ... Redirect to sign in page after signing out. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125. See merge request !541	2015-04-23 12:38:11 +00:00
Dmitriy Zaporozhets	71f6143552	Merge branch 'master' into new-sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb	2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets	4a63573b21	Start applying new layout to snippets pages	2015-04-22 18:17:43 +03:00
Dmitriy Zaporozhets	2505300b7b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/import/google_code_controller.rb	2015-04-21 15:36:58 +03:00
Douwe Maan	355e6868a2	Fix redirect when trying to view invalid Google Code import status.	2015-04-21 10:30:07 +02:00
Jeroen van Baarsen	5a4ebfb47a	Fixed the Rails/ActionFilter cop ... Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-04-20 15:39:37 +02:00
Dmitriy Zaporozhets	a4006a6b48	Merge branch 'better-commit-mentions' into 'master' ... Clean up code around commit mentions. Builds upon !527. See merge request !528	2015-04-20 12:42:31 +00:00
Dmitriy Zaporozhets	41f01dd3f4	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 09:43:01 +00:00
Dmitriy Zaporozhets	359f01c9e0	Merge branch 'rs-issue-2212' into 'master' ... Revert and re-fix image rendering in help pages Closes #2212 See merge request !1765	2015-04-19 16:24:17 +00:00
Douwe Maan	80657c818c	Redirect to sign in page after signing out.	2015-04-18 12:06:50 +02:00
Douwe Maan	dfebcb89e6	Don't save unchanged user map items to the DB.	2015-04-17 13:32:29 +02:00
Douwe Maan	779f05ef0e	Explain skip_before_filter workaround.	2015-04-17 12:49:20 +02:00
Douwe Maan	305725f8d5	Correctly handle blocked users.	2015-04-17 11:33:53 +02:00
Hannes Rosenögger	7bba2a19ab	remove access control for images ... This commit removes the access control for uploaded images. This is needed to display the images in emails again.	2015-04-16 12:37:19 +02:00
Robert Speicher	2d4ffce826	Loosen help page parameter constraints for category	2015-04-15 13:15:18 -04:00
Robert Speicher	3052e89420	Re-fix image rendering for help pages	2015-04-15 12:45:31 -04:00
Robert Speicher	ef47ea3d39	Revert "Fix and improve help rendering" ... This reverts commit d365004e68.	2015-04-15 12:24:44 -04:00
Douwe Maan	959ebbcade	Clean up code around commit mentions.	2015-04-15 17:57:31 +02: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