433 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	3e259ea8bc	Revert "Merge branch 'revert-satellites' into 'master' " ... This reverts commit 5daf44b7c8, reversing changes made to 2f706fbd23.	2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets	9f10943c1a	Revert "Merge branch 'drop-satellites'" ... This reverts commit 957e849f41, reversing changes made to 6b9dbe9f5a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets	7a9d432cdb	Add abuse report management in admin area ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 15:08:22 +02:00
Dmitriy Zaporozhets	cba7f20dc8	Allow users to send abuse reports ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-06 14:03:27 +02:00
Dmitriy Zaporozhets	957e849f41	Merge branch 'drop-satellites'	2015-08-05 15:40:14 +02:00
Stan Hu	0c1ccda43f	Add "Confirm user" button in user admin page ... Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502	2015-08-05 00:35:53 -07:00
Dmitriy Zaporozhets	b48b07044b	Merge branch 'master' into drop-satellites ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-08-04 16:42:36 +02:00
Stan Hu	df2bb60f90	Add support for destroying project milestones ... Closes https://github.com/gitlabhq/gitlabhq/issues/1504	2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets	a7fded9b95	Huge refactoring for accepting merge requests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-16 16:03:07 +02:00
Robert Speicher	800df45db2	Add disable_two_factor route for Admin::Users	2015-07-10 17:18:17 -04:00
Dmitriy Zaporozhets	d192f921c1	Move project activity to separate tab. Add more features to project home page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-07 16:01:12 +02:00
Dmitriy Zaporozhets	f3590c83ea	Merge branch 'audit_log' into 'master' ... Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931	2015-07-06 10:09:53 +00:00
Valery Sizov	411829fdb5	Audit log for user authentication	2015-07-06 12:36:08 +03:00
Stan Hu	3e738e3b9a	Add support for unlocking users in admin settings ... Closes https://github.com/gitlabhq/gitlabhq/issues/9381	2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets	cc04c5b828	Refactor admin user page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-22 17:12:20 +02:00
Dmitriy Zaporozhets	d059c69db7	Move identities list to own controller action ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets	270b7ce810	Add ability for admin to edit user identity ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets	228da2dd28	Admin can see and remove user identities ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-19 15:29:52 +02:00
Robert Speicher	94d3c1433d	Add RootController ... This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.	2015-06-13 17:59:11 -04:00
Robert Speicher	0c0c31ff34	Move the "Design" templates and logic to Preferences	2015-06-13 17:58:16 -04:00
Robert Speicher	821fc4b034	Add Profiles::PreferencesController	2015-06-13 17:58:15 -04:00
Robert Speicher	6e5473f930	Remove show actions from Admin and Project DeployKeys	2015-06-03 18:03:04 -04:00
Dmitriy Zaporozhets	acb7721fe8	Merge branch 'rs-teaspoon' into 'master' ... Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715	2015-05-29 09:10:46 +00:00
Robert Speicher	f46b367068	Add MergeRequests#commits action and route ... /:namespace_id/:project_id/merge_requests/:id/commits(.:format)	2015-05-29 00:09:28 -04:00
Robert Speicher	05aa71ccd9	Remove jasmine-rails; add teaspoon	2015-05-28 18:22:32 -04:00
Dmitriy ZaporozhetsandRobert Speicher	8ae712ae28	Render 2fa recovery codes instead of downloading it	2015-05-09 17:31:39 -04:00
Dmitriy ZaporozhetsandRobert Speicher	802fcd051f	Add support for backup codes	2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher	ba7e2fd946	Create Two-factor authentication resource for user	2015-05-09 17:31:10 -04:00
Stan Hu	ef0055b52d	Fix bug where commit data would not appear in some subdirectories ... The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459	2015-04-26 23:52:40 -07:00
Douwe Maan	a6dfd065ca	Add atom feed for project activity.	2015-04-23 17:11:39 +02: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	a22f3139f3	Merge branch 'rs-reply-hotkey' into 'master' ... "Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775	2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets	4a63573b21	Start applying new layout to snippets pages	2015-04-22 18:17:43 +03:00
Robert Speicher	d5c7b62b8e	rails g jasmine_rails:install	2015-04-18 15:17:25 -04:00
Robert Speicher	2d4ffce826	Loosen help page parameter constraints for category	2015-04-15 13:15:18 -04:00
Robert Speicher	e24cb79f31	Add constraints to help#show route parameters	2015-04-15 12:25:37 -04:00
Robert Speicher	ef47ea3d39	Revert "Fix and improve help rendering" ... This reverts commit d365004e68.	2015-04-15 12:24:44 -04: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
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
Douwe Maan	e50556fcc8	Let invites be declined.	2015-04-14 12:08:11 +02:00
Douwe Maan	453340d449	Let membership invitations be resent.	2015-04-14 12:08:10 +02:00
Douwe Maan	39f389ae0f	Add invites controller.	2015-04-14 12:07:33 +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
Douwe Maan	93133f4da9	Fix directory traversal vulnerability around uploads routes.	2015-04-10 18:18:37 +02:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00
Douwe Maan	edc4a56d26	Allow admin to create public deploy keys that are accessible to any project.	2015-04-03 12:23:20 +02:00
Sullivan SENECHALandSullivan SENECHAL	d365004e68	Fix and improve help rendering	2015-04-03 11:56:50 +02:00
Dmitriy Zaporozhets	26053c8705	Add autocomplete controller	2015-03-26 19:06:19 -07:00