Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 'master' | Douwe Maan | 2015-04-14 | 1 | -1/+1 |
|\ | |||||
| * | Fix error message | Zbigniew Motyka | 2015-04-14 | 1 | -1/+1 |
* | | Merge branch 'dir-traversal' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 1 | -1/+32 |
|\ \ | |||||
| * | | Add explanation to HelpController#clean_path_info. | Douwe Maan | 2015-04-14 | 1 | -3/+16 |
| * | | Fix directory traversal vulnerability around help pages. | Douwe Maan | 2015-04-10 | 1 | -1/+19 |
* | | | Allow user to choose which email to be public | Senorsen | 2015-04-14 | 6 | -4/+29 |
* | | | Revert "Merge branch 'fix-stuck-mr' into 'master'" | Douwe Maan | 2015-04-14 | 1 | -1/+1 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-14 | 14 | -43/+13 |
|\ \ \ | |||||
| * \ \ | Merge branch 'revert_fix_email_images' into 'master' | Douwe Maan | 2015-04-14 | 4 | -28/+3 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Revert "Merge branch 'fix_email_images' into 'master'" | Hannes Rosenögger | 2015-04-13 | 4 | -28/+3 |
| * | | | Merge branch 'fix-stuck-mr' into 'master' | Douwe Maan | 2015-04-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | fix stuck MR | Ben Bodenmiller | 2015-04-14 | 1 | -1/+1 |
| * | | | | Merge branch 'empty-avatar-alt-text' into 'master' | Hannes Rosenögger | 2015-04-13 | 8 | -9/+9 |
| |\ \ \ \ | |||||
| | * | | | | Explicitly set image alt to prevent graphical glitches | Sven Strickroth | 2015-04-13 | 8 | -9/+9 |
| * | | | | | Merge branch 'remove-sidebar-help-link' into 'master' | Hannes Rosenögger | 2015-04-13 | 1 | -5/+0 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Removed help link from sidebar | Phil Hughes | 2015-03-31 | 1 | -5/+0 |
* | | | | | | Merge branch 'rs-link-to-performance' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 1 | -21/+23 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use `start_with?` instead of String slicing to check for external links | Robert Speicher | 2015-04-12 | 1 | -1/+1 |
| * | | | | | Speed up the overridden `link_to` helper | Robert Speicher | 2015-04-12 | 1 | -21/+23 |
* | | | | | | Merge branch 'ldap_migration' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix ldap identities | Valery Sizov | 2015-04-11 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'reference-access-control' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 14 | -79/+87 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor ClosingIssueExtractor. | Douwe Maan | 2015-04-03 | 2 | -3/+3 |
| * | | | | | | Don't require user to every gfm call. | Douwe Maan | 2015-04-03 | 1 | -1/+1 |
| * | | | | | | Fix errors. | Douwe Maan | 2015-04-02 | 6 | -21/+24 |
| * | | | | | | Only allow users to cross-reference and close issues they have access to. | Douwe Maan | 2015-04-02 | 4 | -10/+10 |
| * | | | | | | Only allow user to see participants from groups they have access to. | Douwe Maan | 2015-04-02 | 5 | -12/+12 |
| * | | | | | | Add Commit#author and #committer. | Douwe Maan | 2015-04-02 | 3 | -4/+13 |
| * | | | | | | Slightly refactor getting note notification recipients. | Douwe Maan | 2015-04-02 | 2 | -15/+24 |
| * | | | | | | Refactor Mentionable mentioned users to use ReferenceExtractor. | Douwe Maan | 2015-04-02 | 1 | -17/+6 |
| * | | | | | | Only allow user to reference objects they have access to. | Douwe Maan | 2015-04-02 | 1 | -1/+1 |
| * | | | | | | Slightly refactor ReferenceExtractor. | Douwe Maan | 2015-04-02 | 1 | -5/+3 |
* | | | | | | | Merge branch 'skip-email-reconfirmation' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation | Douwe Maan | 2015-04-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-04-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #9104 from jdsn/fix-issue9098-clean_path | Dmitriy Zaporozhets | 2015-04-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | clean_path should drop all leading dashes, not just one | J. Daniel Schmidt | 2015-04-08 | 1 | -1/+1 |
| | * | | | | | | | clean_path should drop all trailing dots, not just one | J. Daniel Schmidt | 2015-04-08 | 1 | -1/+1 |
| | * | | | | | | | clean_path should not drop the last character | J. Daniel Schmidt | 2015-04-08 | 1 | -1/+1 |
* | | | | | | | | | Fix performance issue when browse big diffs | Dmitriy Zaporozhets | 2015-04-13 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'public-deploy-keys' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 12 | -34/+228 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clean up code. | Douwe Maan | 2015-04-03 | 7 | -27/+48 |
| * | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. | Douwe Maan | 2015-04-03 | 11 | -29/+202 |
* | | | | | | | | | Merge branch 'fix-group-project-list-cache' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Bust group page project list cache when namespace name or path changes.fix-group-project-list-cache | Douwe Maan | 2015-04-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'arbitrary-local-repo-import' into 'master' | Dmitriy Zaporozhets | 2015-04-12 | 6 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Don't use URI.regexp to validate since it doens't have start/end anchors. | Douwe Maan | 2015-04-11 | 5 | -5/+5 |
| * | | | | | | | | | Fix project import URL regex to prevent arbitary local repos from being impor... | Douwe Maan | 2015-04-11 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix typo | Stan Hu | 2015-04-11 | 1 | -1/+1 |