2162 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	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
Douwe Maan	80097606f5	Make sure user has access to namespace in import tests.	2015-04-15 16:58:43 +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	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	4ab22a8c32	Merge branch 'ldap-block_auto_created_users' into 'master' ... Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522	2015-04-15 12:36:43 +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	9d00bb0896	Import Google Code issue assignee when mapped.	2015-04-14 23:22:14 +02:00
Douwe Maan	238e4f0295	Add config var to block auto-created LDAP users.	2015-04-14 17:09:05 +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
Douwe Maan	dba63d667d	Allow user map to be specified.	2015-04-14 14:50:56 +02:00
Douwe Maan	f6cb42f3d1	Add comment number to imported Google Code comments.	2015-04-14 13:13:18 +02:00
Douwe Maan	dfe659c16d	Remove author link since all code.google.com links will be shut down.	2015-04-14 13:11:29 +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	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +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	1221bec56c	Refactor key fingerprint generation.	2015-04-14 12:00:43 +02:00
Dmitriy Zaporozhets	6b479b6cb0	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-14 11:55:10 +03:00
Douwe Maan	36537c65e3	Merge branch 'revert_fix_email_images' into 'master' ... Revert "Merge branch 'fix_email_images' into 'master'" This reverts commit d66148ef39, reversing changes made to cdb64a81a8. This change needed to be reverted, because not enough email clients support inline images. /cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;) See merge request !513	2015-04-14 08:44:24 +00:00
Dmitriy Zaporozhets	c420255401	Merge branch 'rs-remove-invalid-key-factories' into 'master' ... Remove the invalid key factories They're only used once each, and they're easy to build in-place. See merge request !1766	2015-04-14 07:33:55 +00:00
Dmitriy Zaporozhets	4632983c8c	Merge branch 'rs-link-to-performance' into 'master' ... Speed up the overridden `link_to` helper Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character. See merge request !1767	2015-04-14 07:33:09 +00: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
Jacob Vosmaer	65a3928b0b	Remove test for 'ldap' provider special case	2015-04-13 12:58:10 +02:00
Hannes Rosenögger	8e9fbd847d	Revert "Merge branch 'fix_email_images' into 'master'" ... This reverts commit d66148ef39, reversing changes made to cdb64a81a8. This change needed to be reverted, because not enough email clients support inline images.	2015-04-13 12:34:47 +02: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
Robert Speicher	975f1e6ec8	Speed up the overridden link_to helper ... Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character.	2015-04-12 17:48:28 -04: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
Robert Speicher	273df6a44b	Remove the invalid key factories ... They're only used once each, and they're easy to build in-place.	2015-04-11 17:12:10 -04: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
Dmitriy Zaporozhets	705e43bf04	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-04-10 19:39:11 +03:00
Douwe Maan	6331759735	Merge branch 'fix-submodules-with-relative-links' into 'master' ... Fix broken file browsing with a submodule that has a relative link ## What does this MR do? This MR fixes an error that occurs when browsing a submodule with a relative link. ### Are there points in the code the reviewer needs to double check? I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer. ### Why was this MR needed? A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug: 1. Start a new project in GitLab. 2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally. 3. Push repo to new project. 4. Click on "Files" in the project. The .gitmodules file: ``` [submodule "chopstx"] path = chopstx url = ../../chopstx/chopstx.git ``` ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? 1. #775 2. #1385 3. https://github.com/gitlabhq/gitlabhq/issues/8153 4. https://github.com/gitlabhq/gitlabhq/issues/8881 5. https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !508	2015-04-10 11:51:24 +00:00
Stan Hu	7d089701f1	Fix broken file browsing with a submodule that has a relative link ... Closes #775	2015-04-09 22:10:59 -07:00
Robert Speicher	2cefdbb535	Move lib/gitlab/oauth to lib/gitlab/o_auth ... Lets Rails autoload these files by name	2015-04-09 14:19:24 -04: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
Robert Speicher	57afaf9d92	Upon successful login, clear reset_password_token field ... Closes #1942	2015-04-08 16:06:56 -04: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
Robert Speicher	167a6b9eef	Render a 404 when RefsController#logs_tree gets an HTML request ... Fixes #2152	2015-04-06 23:08:28 -04:00
Valery Sizov	bafec400f1	CI forking: tests	2015-04-06 19:45:16 +03:00
Douwe Maan	45ca39e81b	Merge remote-tracking branch 'github.com/master'	2015-04-04 14:23:32 +02:00
Douwe Maan	06399b3261	Show Google Code image attachments inline.	2015-04-04 14:19:05 +02:00