8955 Commits

Include renames

Author	SHA1	Message	Date
Robert Speicher	96c2b94048	Reference filters ✨ ... Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users.	2015-04-20 13:01:42 -04: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	76aade28e2	Merge pull request #9075 from Soullivaneuh/bootlint ... Bootlint integration	2015-04-20 16:03:43 +03: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
Ben Bodenmiller	47769bfd59	improve new project options ... * Simplify new repo commands * Include directions for how to add an existing folder that is either already a repo or not yet a repo Replaces #7918.	2015-04-20 03:13:39 -07: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
Jeroen van Baarsen	4f349fcb69	Merge pull request #9150 from digitalmediacenter/master ... do not prepend relative_url_root to avatar	2015-04-20 11:01:59 +02:00
Dmitriy Zaporozhets	d012648b49	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 08:30:05 +00:00
Leo Antunes	f2a817f040	do not prepend relative_url_root to avatar ... The commit.author.icon variable contains a full URL, which gets broken when prepended by the relative_url_root setting (generating hrefs like "/gitlabhttps://...".	2015-04-20 09:52:03 +02:00
Dmitriy Zaporozhets	41b45ece99	Merge branch 'rs-issue-2219' into 'master' ... Let Bootstrap's tab JS handle history Closes #2219 See merge request !1784	2015-04-19 16:30:26 +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
Robert Speicher	4d1878253e	Typo: Issueable -> Issuable	2015-04-18 15:20:15 -04:00
Robert Speicher	8e6fa2555e	Add JS specs for replyWithSelectedText	2015-04-18 15:17:26 -04:00
Robert Speicher	ca5d0c8250	Add hotkey for "reply with selected text" to Issueable	2015-04-18 15:17:26 -04:00
Robert Speicher	4603bf500a	Add 'reply' hotkey to help modal	2015-04-18 15:17:26 -04:00
Robert Speicher	662bdfbeb1	Make StatGraph JS explicitly require its dependencies ... This allows us to test them in a bit more isolation.	2015-04-18 15:17:25 -04:00
Robert Speicher	7d5fefb780	Fix 'merge_reuests' typo	2015-04-18 15:17:24 -04:00
Douwe Maan	80657c818c	Redirect to sign in page after signing out.	2015-04-18 12:06:50 +02:00
Robert Speicher	269aee790c	Let Bootstrap's tab JS handle history ... Closes #2219	2015-04-17 16:42:38 -04:00
Douwe Maan	da89ebbe48	Fix label color input.	2015-04-17 17:38:31 +02:00
Dmitriy Zaporozhets	e1099f9717	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 14:01:33 +00:00
Douwe Maan	7d98c8842d	Move import data out of project so it doesn't take ages to load.	2015-04-17 14:49:00 +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	46524ecb33	Fix username period migration to preserve uniqueness of names and paths.	2015-04-17 12:03:54 +02:00
Douwe Maan	305725f8d5	Correctly handle blocked users.	2015-04-17 11:33:53 +02:00
Douwe Maan	630e879066	Clean up code somewhat.	2015-04-17 11:03:33 +02:00
Dmitry Medvinsky	92544df8da	Fix auto-selection of URL field with X11 selection ... We use `focusin` event instead of `click` because when using the latter, when the selection is created it isn't put into X11 PRIMARY selection. And as a Linux user I'm very used to such behaviour that when something gets selected, it's ready for pasting, which is the primary purpose of the clone URL field. When `focusin` is used, the selection is copied to X11 buffer automatically, so it works as expected (tested in Firefox and Chrome).	2015-04-17 10:16:18 +03:00
Robert Speicher	2dace3679f	Note#cross_reference_exists? should be checking the noteable_type also	2015-04-16 16:30:15 -04: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
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
Robert Speicher	2d4ffce826	Loosen help page parameter constraints for category	2015-04-15 13:15:18 -04:00
Douwe Maan	a9b04c4536	Fix Snippet#participants.	2015-04-15 18:59:01 +02: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
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	c644dd01a4	Only send note notifications to people accessible by the note author. ... Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.	2015-04-15 17:57:31 +02:00
Douwe Maan	7633d60268	Include snippet author in recipients of snippet note notification.	2015-04-15 17:57:31 +02:00
Douwe Maan	959ebbcade	Clean up code around commit mentions.	2015-04-15 17:57:31 +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