1745 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	7ef05ad0e8	Merge branch 'fix_ci_services' into 'master' ... Fix CI links on MR page Fixes gitlab-org/gitlab-ci#145 See merge request !609	2015-05-06 14:42:31 +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
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
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	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	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	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
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
Ben Bodenmiller	f517dd2606	fix stuck mr ... fixes #348. related to 6487419364.	2015-04-14 23:11:13 -07:00
Douwe Maan	c1531fe1d8	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
Douwe Maan	5662b24132	Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.	2015-04-14 16:32:11 +02:00
Douwe Maan	cb5362e7ce	Follow newline guidelines.	2015-04-14 15:16:00 +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	0013ea5130	Remove duplication between Group and ProjectMember.	2015-04-14 12:41:19 +02:00
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	1c0824f451	Correctly import invited members.	2015-04-14 12:08:11 +02:00
Douwe Maan	87dd3f215f	Let members be invited from Add members pane.	2015-04-14 12:08:10 +02:00
Douwe Maan	717fa136a5	Add emails around invitation.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +02:00
Douwe Maan	629fa7fbe3	Add invite logic to Member.	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
Douwe Maan	1221bec56c	Refactor key fingerprint generation.	2015-04-14 12:00:43 +02:00
Douwe Maan	ae6d0aaae0	Revert "Merge branch 'fix-stuck-mr' into 'master'" ... This reverts commit 79b4d0b0c0, reversing changes made to a1e147ce22.	2015-04-14 11:03:23 +02:00
Ben Bodenmiller	fb1cd0a842	fix stuck MR ... fixes #348. related to 6487419364.	2015-04-14 00:15:34 -07:00
Dmitriy Zaporozhets	4ab717ea6a	Merge branch 'ldap_migration' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb	2015-04-13 17:18:02 +03:00
Dmitriy Zaporozhets	ecb58dacd6	Merge branch 'reference-access-control' into 'master' ... 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	2015-04-13 14:10:25 +00:00
Dmitriy Zaporozhets	9e848bcd5a	Merge pull request #9104 from jdsn/fix-issue9098-clean_path ... Fix issue9098 clean path	2015-04-13 12:17:35 +03: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	8d9d63b250	Merge branch 'arbitrary-local-repo-import' into 'master' ... Prevent arbitary local repos from being imported. Fixes gitlab/gitlab-ee#263. See merge request !1763	2015-04-12 10:21:15 +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
Robert Speicher	307962a046	Rename last uses of Buildbox to Buildkite	2015-04-11 14:05:22 -04:00
Robert Speicher	93b1767799	Move buildbox_service files to buildkite_service	2015-04-11 14:05:22 -04:00
Robert Speicher	4077f66beb	Sort available_services_names array alphabetically	2015-04-11 14:05:22 -04:00
Valery Sizov	8666f497ff	fix ldap identities	2015-04-11 17:56:45 +03:00
Douwe Maan	9e52a2dcab	Don't use URI.regexp to validate since it doens't have start/end anchors.	2015-04-11 11:38:14 +02:00
Douwe Maan	cebb74a0c0	Fix project import URL regex to prevent arbitary local repos from being imported.	2015-04-11 11:37:58 +02:00
Douwe Maan	0ece6bd828	Use \A and \z in regexes instead of ^ and $.	2015-04-10 18:31:07 +02:00
Douwe Maan	6cf7dd625a	Fix persistent XSS vulnerability around profile website URLs.	2015-04-10 18:30:49 +02:00
Dmitriy Zaporozhets	1ff40a7946	Merge branch 'ci_fork' into 'master' ... Project fork on CI side https://dev.gitlab.org/gitlab/gitlab-ci/issues/187 !!! GitLab CI side MR - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/56 See merge request !499	2015-04-09 13:41:37 +00:00
J. Daniel Schmidt	d03cec0e69	clean_path should drop all leading dashes, not just one	2015-04-08 15:54:27 +02:00
J. Daniel Schmidt	706be56317	clean_path should drop all trailing dots, not just one	2015-04-08 15:54:21 +02:00
J. Daniel Schmidt	2794e57beb	clean_path should not drop the last character ... Fixes https://github.com/gitlabhq/gitlabhq/issues/9098	2015-04-08 10:51:36 +02:00
Valery Sizov	bafec400f1	CI forking: tests	2015-04-06 19:45:16 +03:00
Douwe Maan	4740242a67	Change text of project creation event for imports.	2015-04-06 14:51:41 +02:00
Valery Sizov	9c2301808b	CI project forking	2015-04-06 15:20:58 +03:00
Douwe Maan	e33ddfebf2	Refactor ClosingIssueExtractor.	2015-04-03 18:03:26 +02:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00