7718 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy ZaporozhetsandDmitriy Zaporozhets	2c8c782b7e	Merge branch 'rs-issue-2257' into 'master' ... Recover from URI::Error `URI::Error` is the base class for all URI errors. Fixes #2257 and #2260 See merge request !1789	2015-04-22 16:06:07 +03:00
Dmitriy Zaporozhets	20a66988d8	Merge branch 'rs-toggle-tab' into 'master' ... Fix tab behavior on MergeRequests#new Missed this one in 269aee790c Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents. See merge request !556	2015-04-22 15:11:09 +03:00
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	dfc5680b1c	Merge branch 'fix-label-color-input' into 'master' ... Fix label color input. Because `value` was set, every label color would render as purple in the form. Introduced by 83b5a9ae2b between 7.9 and 7.10, so no changelog item. See merge request !538	2015-04-20 12:32:48 +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
Douwe MaanandDmitriy Zaporozhets	b6d01abc02	Fix username period migration to preserve uniqueness of names and paths.	2015-04-17 14:33:34 +03:00
Marin Jankovski	ed94cde2b2	Merge pull request #9089 from dsander/fix-merge-request-comments ... Fix merge request comments on files with multiple commits	2015-04-15 19:34:38 +02:00
Dominik Sander	d4fec49abc	Fix merge request comments on files with multiple commits ... Having a merge request with a comments on a line which is then changed in a later commit prevented new comments from properly showing up in the merge request show page. * `Note#set_diff` do not use stored the diff when creating a new note in merge requests (we can not be sure the diff did not changed since the last comment on that line) * Do not rely just on `outdated?` of the first note when displaying comments of a MR in the discussion tab, but partition the active/outdated notes and display them all * In the inline changes tab just select the active notes, so an outdated note does not prevent an active one from being rendered * Just show active comments in the side-by-side changes tab	2015-04-15 18:23:57 +02:00
Douwe Maan	b73ffbd3cb	Fix for snippets.	2015-04-15 17:57:26 +02:00
Douwe Maan	efe9629346	Fix Mention notification level.	2015-04-15 17:57:26 +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	345e32d332	Merge branch 'sstanovnik-openssh_fix' into 'master' ... 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	2015-04-15 12:40:30 +00:00
Dmitriy Zaporozhets	d2a895dad8	Merge branch 'emailsonpush-replyto' into 'master' ... 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	2015-04-15 12:37:51 +00:00
Dmitriy Zaporozhets	089f5b914e	Merge branch 'emailsonpush-hellip' into 'master' ... 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	2015-04-15 12:37:19 +00: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
Dmitriy Zaporozhets	b75866120b	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-15 12:56:25 +03:00
Douwe Maan	b409c37671	Merge branch 'fix-stuck-mr' into 'master' ... 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 6487419364. Replaces !517. /cc @DouweM See merge request !526	2015-04-15 09:50:46 +00:00
Dmitriy Zaporozhets	3d9cbc5dcb	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-04-15 12:44:59 +03:00
Dmitriy Zaporozhets	400c9c5ae2	Revert "Removed help link from sidebar" ... This reverts commit 6fe26e3e46.	2015-04-15 12:12:58 +03: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
Dmitriy Zaporozhets	0a0d6050fc	Merge pull request #8905 from jasonblanchard/remove-truncation-milestone ... Remove truncation from issue titles on milestone page	2015-04-15 09:22:46 +03:00
Ben Bodenmiller	f517dd2606	fix stuck mr ... fixes #348. related to 6487419364.	2015-04-14 23:11:13 -07:00
Douwe Maan	36b54fc04f	Don't crash when project repository doesn't exist.	2015-04-14 23:26:53 +02:00
Douwe Maan	88c2639356	Remove superfluous info from invite accepted/declined mails.	2015-04-14 23:06:21 +02:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
Dmitriy Zaporozhets	afb43a8fcd	Use smae background for git clone text and project visibility ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 18:29:20 +03:00
Dmitriy Zaporozhets	09eea7ea84	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-14 18:13:38 +03:00
Douwe Maan	6157dad9ff	Merge branch 'master' into 'master' ... Fix error message This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback. See merge request !518	2015-04-14 15:08:58 +00:00
Dmitriy Zaporozhets	5262ba3c9a	Default buttons should look the same on project page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 17:45:43 +03:00
Douwe Maan	5662b24132	Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.	2015-04-14 16:32:11 +02:00
Dmitriy Zaporozhets	dab1824679	Align project download button with others in sidebar on project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 17:08:01 +03:00
Dmitriy Zaporozhets	0c6217e2dc	Add border radius and shadow to project avatar on project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 16:40:59 +03:00
Dmitriy Zaporozhets	29970204ea	Fix button overflow for branches/tags pages ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-04-14 16:26:47 +03:00
Jason Blanchard	f543f1c3dd	Remove truncation from issue titles on milestone page	2015-04-14 09:17:57 -04: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	1abda4458e	"interpunction" -> "punctuation"	2015-04-14 14:59:10 +02:00
Douwe Maan	4c6ce0ef78	Move Specify user map button to paragraph.	2015-04-14 14:57:15 +02: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	c26b001ebc	Set EmailsOnPush reply-to address to committer email when enabled.	2015-04-14 12:52:33 +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