summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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-146-4/+29
* | Revert "Merge branch 'fix-stuck-mr' into 'master'"Douwe Maan2015-04-141-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1414-43/+13
|\ \
| * \ Merge branch 'revert_fix_email_images' into 'master'Douwe Maan2015-04-144-28/+3
| |\ \
| | * | Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-134-28/+3
| * | | Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-141-1/+1
| |\ \ \
| | * | | fix stuck MRBen Bodenmiller2015-04-141-1/+1
| * | | | Merge branch 'empty-avatar-alt-text' into 'master'Hannes Rosenögger2015-04-138-9/+9
| |\ \ \ \
| | * | | | Explicitly set image alt to prevent graphical glitchesSven Strickroth2015-04-138-9/+9
| * | | | | Merge branch 'remove-sidebar-help-link' into 'master'Hannes Rosenögger2015-04-131-5/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Removed help link from sidebarPhil Hughes2015-03-311-5/+0
* | | | | | Merge branch 'rs-link-to-performance' into 'master'Dmitriy Zaporozhets2015-04-141-21/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use `start_with?` instead of String slicing to check for external linksRobert Speicher2015-04-121-1/+1
| * | | | | Speed up the overridden `link_to` helperRobert Speicher2015-04-121-21/+23
* | | | | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-131-0/+1
|\ \ \ \ \ \
| * | | | | | fix ldap identitiesValery Sizov2015-04-111-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-1314-79/+87
|\ \ \ \ \ \
| * | | | | | Refactor ClosingIssueExtractor.Douwe Maan2015-04-032-3/+3
| * | | | | | Don't require user to every gfm call.Douwe Maan2015-04-031-1/+1
| * | | | | | Fix errors.Douwe Maan2015-04-026-21/+24
| * | | | | | Only allow users to cross-reference and close issues they have access to.Douwe Maan2015-04-024-10/+10
| * | | | | | Only allow user to see participants from groups they have access to.Douwe Maan2015-04-025-12/+12
| * | | | | | Add Commit#author and #committer.Douwe Maan2015-04-023-4/+13
| * | | | | | Slightly refactor getting note notification recipients.Douwe Maan2015-04-022-15/+24
| * | | | | | Refactor Mentionable mentioned users to use ReferenceExtractor.Douwe Maan2015-04-021-17/+6
| * | | | | | Only allow user to reference objects they have access to.Douwe Maan2015-04-021-1/+1
| * | | | | | Slightly refactor ReferenceExtractor.Douwe Maan2015-04-021-5/+3
* | | | | | | 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 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-131-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #9104 from jdsn/fix-issue9098-clean_pathDmitriy Zaporozhets2015-04-131-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | clean_path should drop all leading dashes, not just oneJ. Daniel Schmidt2015-04-081-1/+1
| | * | | | | | | clean_path should drop all trailing dots, not just oneJ. Daniel Schmidt2015-04-081-1/+1
| | * | | | | | | clean_path should not drop the last characterJ. Daniel Schmidt2015-04-081-1/+1
* | | | | | | | | Fix performance issue when browse big diffsDmitriy Zaporozhets2015-04-131-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-1312-34/+228
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up code.Douwe Maan2015-04-037-27/+48
| * | | | | | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-0311-29/+202
* | | | | | | | | Merge branch 'fix-group-project-list-cache' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Bust group page project list cache when namespace name or path changes.fix-group-project-list-cacheDouwe Maan2015-04-101-1/+1
* | | | | | | | | Merge branch 'arbitrary-local-repo-import' into 'master'Dmitriy Zaporozhets2015-04-126-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't use URI.regexp to validate since it doens't have start/end anchors.Douwe Maan2015-04-115-5/+5
| * | | | | | | | | Fix project import URL regex to prevent arbitary local repos from being impor...Douwe Maan2015-04-111-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typoStan Hu2015-04-111-1/+1
* | | | | | | | | | Merge branch 'regex-start-of-string' into 'master'Dmitriy Zaporozhets2015-04-129-15/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use `\A` and `\z` in regexes instead of `^` and `$`.Douwe Maan2015-04-108-13/+11