summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-158-20/+128
|\
| * Merge branch 'fix-repository-rescue' into 'master'Dmitriy Zaporozhets2015-04-151-1/+1
| |\
| | * Don't crash when project repository doesn't exist.fix-repository-rescueDouwe Maan2015-04-141-1/+1
| * | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-157-19/+127
| |\ \
| | * | Follow newline guidelines.Douwe Maan2015-04-143-4/+11
| | * | Remove duplication between Group and ProjectMember.Douwe Maan2015-04-141-2/+1
| | * | Clear up InvitesController member lookup logic.Douwe Maan2015-04-141-5/+4
| | * | Remove duplication from InvitesController.Douwe Maan2015-04-141-25/+22
| | * | Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-143-9/+9
| | * | Let invites be declined.Douwe Maan2015-04-141-0/+27
| | * | Use notice flash type rather than nonexistent info.Douwe Maan2015-04-141-2/+2
| | * | Let membership invitations be resent.Douwe Maan2015-04-142-0/+24
| | * | Let members be invited from Add members pane.Douwe Maan2015-04-141-2/+1
| | * | Add invites controller.Douwe Maan2015-04-142-2/+59
| | * | Only show invited users to people who can admin group.Douwe Maan2015-04-142-0/+3
| | * | Reference project members by id instead of user_id.Douwe Maan2015-04-141-6/+2
| | * | Track who created a group or project member.Douwe Maan2015-04-143-3/+3
| | * | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-142-2/+2
* | | | Merge branch 'search-information-leak' into 'master'Dmitriy Zaporozhets2015-04-151-5/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Don't leak existence of group or project via search.Douwe Maan2015-04-101-4/+11
| * | | Don't leak existence of project via search autocomplete.Douwe Maan2015-04-101-1/+6
* | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-151-0/+111
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow user map to be specified.Douwe Maan2015-04-141-2/+50
| * | | Add instructions to Google Code import page.Douwe Maan2015-04-031-3/+3
| * | | Allow projects to be imported from Google Code.Douwe Maan2015-04-031-0/+63
* | | | Merge branch 'dir-traversal' into 'master'Dmitriy Zaporozhets2015-04-141-1/+32
|\ \ \ \
| * | | | Add explanation to HelpController#clean_path_info.Douwe Maan2015-04-141-3/+16
| * | | | Fix directory traversal vulnerability around help pages.Douwe Maan2015-04-101-1/+19
| | |/ / | |/| |
* | | | Allow user to choose which email to be publicSenorsen2015-04-142-4/+7
| |_|/ |/| |
* | | Merge branch 'skip-email-reconfirmation' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \ \
| * | | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmationDouwe Maan2015-04-061-1/+1
* | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-132-16/+62
|\ \ \ \
| * | | | Clean up code.Douwe Maan2015-04-032-10/+19
| * | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-032-13/+50
| | |_|/ | |/| |
* | | | Merge branch 'regex-start-of-string' into 'master'Dmitriy Zaporozhets2015-04-121-1/+1
|\ \ \ \
| * | | | Use `\A` and `\z` in regexes instead of `^` and `$`.Douwe Maan2015-04-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-issue-1942' into 'master'Dmitriy Zaporozhets2015-04-121-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Upon successful login, clear `reset_password_token` fieldRobert Speicher2015-04-081-1/+7
* | | | Merge branch 'fix-slashes-in-wiki-urls' into 'master'Douwe Maan2015-04-081-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bug where Wiki pages that include a '/' were no longer accessibleStan Hu2015-04-071-1/+5
* | | | Merge branch 'rs-issue-2152' into 'master'Dmitriy Zaporozhets2015-04-081-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Render a 404 when RefsController#logs_tree gets an HTML requestRobert Speicher2015-04-061-0/+5
* | | | Allow projects to be imported into namespaces user is master of.Douwe Maan2015-04-061-1/+1
| |_|/ |/| |
* | | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-041-5/+23
|\ \ \ | |_|/ |/| |
| * | Fix and improve help renderingSullivan SENECHAL2015-04-031-5/+23
| |/
* | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-0/+2
|\ \ | |/ |/|
| * Support configurable attachment size via Application SettingsStan Hu2015-04-022-0/+2
* | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-023-3/+12
|\ \
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i...Douwe Maan2015-03-313-3/+12
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-021-5/+5
|\ \ \ | |_|/ |/| |
View Lorry Controller Status