summaryrefslogtreecommitdiff
path: root/config/routes.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add support for destroying project milestonesStan Hu2015-07-171-1/+1
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+1
|
* Move project activity to separate tab. Add more features to project home pageDmitriy Zaporozhets2015-07-071-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-1/+1
|\ | | | | | | | | | | | | | | Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
| * Audit log for user authenticationValery Sizov2015-07-061-1/+1
| |
* | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9381
* Refactor admin user pageDmitriy Zaporozhets2015-06-221-0/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add RootControllerRobert Speicher2015-06-131-1/+1
| | | | | | 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.
* Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-1/+0
|
* Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+1
|
* Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-2/+2
|
* Merge branch 'rs-teaspoon' into 'master'Dmitriy Zaporozhets2015-05-291-1/+0
|\ | | | | | | | | | | | | | | | | | | 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
| * Remove jasmine-rails; add teaspoonRobert Speicher2015-05-281-1/+0
| |
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-0/+1
|/ | | | /:namespace_id/:project_id/merge_requests/:id/commits(.:format)
* Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-1/+1
|
* Add support for backup codesDmitriy Zaporozhets2015-05-091-1/+5
|
* Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+1
|
* Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-261-1/+1
| | | | | | | The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459
* Add atom feed for project activity.Douwe Maan2015-04-231-3/+3
|
* Merge branch 'master' into new-sidebarDmitriy Zaporozhets2015-04-231-0/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb
| * Merge branch 'rs-reply-hotkey' into 'master'Dmitriy Zaporozhets2015-04-221-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | "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
| | * rails g jasmine_rails:installRobert Speicher2015-04-181-0/+1
| | |
* | | Start applying new layout to snippets pagesDmitriy Zaporozhets2015-04-221-1/+2
|/ /
* | Loosen help page parameter constraints for categoryRobert Speicher2015-04-151-1/+1
| |
* | Add constraints to help#show route parametersRobert Speicher2015-04-151-1/+1
| |
* | Revert "Fix and improve help rendering"Robert Speicher2015-04-151-1/+1
|/ | | | This reverts commit d365004e684e98459061fcd5fbaf9bea880934a8.
* Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-151-0/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png) Entering an email address that is not already a member will give you the option to invite them. ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png) Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members. ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png) 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. ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png) The invited user will receive an email with an "Accept invitation" link. ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png) If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice. ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png) 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. ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png) Accepting the invitation will redirect them to the group (or project) with an appropriate notice. ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png) As currently, they will also receive this information by email. ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png) 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. ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png) The member row on the Members page will now have been updated with the new user account. ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png) See merge request !500
| * Let invites be declined.Douwe Maan2015-04-141-0/+1
| |
| * Let membership invitations be resent.Douwe Maan2015-04-141-0/+5
| |
| * Add invites controller.Douwe Maan2015-04-141-0/+9
| |
* | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @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 ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
| * | Allow user map to be specified.Douwe Maan2015-04-141-0/+3
| | |
| * | Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+6
| | |
* | | Merge branch 'dir-traversal' into 'master'Dmitriy Zaporozhets2015-04-141-4/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix directory traversal vulnerability around uploads routes.Douwe Maan2015-04-101-4/+4
| | |
* | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-1/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) 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: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-1/+3
| |/
* | Fix and improve help renderingSullivan SENECHAL2015-04-031-1/+1
|/
* Add autocomplete controllerDmitriy Zaporozhets2015-03-261-0/+5
|
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-211-1/+5
|
* Fix commits routingDmitriy Zaporozhets2015-03-201-2/+1
|
* Fix commits routing for branches with slashfix-commits-routingDmitriy Zaporozhets2015-03-201-11/+20
|
* Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-181-1/+4
|
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-171-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
| * testsValery Sizov2015-03-161-2/+2
| |
| * SubscriptionValery Sizov2015-03-151-0/+4
| |
* | Move group leave action from dashboard/groups to groups/group_members.Douwe Maan2015-03-151-5/+2
| |