| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'reference-access-control' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 22 | -257/+277 |
| |\ | | | | | | | | | | | | | | | Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742 | ||||
| | * | Update tests. | Douwe Maan | 2015-04-03 | 2 | -48/+54 |
| | | | |||||
| | * | Refactor ClosingIssueExtractor. | Douwe Maan | 2015-04-03 | 3 | -15/+14 |
| | | | |||||
| | * | Refactor ReferenceExtractor. | Douwe Maan | 2015-04-03 | 1 | -29/+28 |
| | | | |||||
| | * | Don't require user to every gfm call. | Douwe Maan | 2015-04-03 | 2 | -22/+22 |
| | | | |||||
| | * | Allow byebug to be used in test. | Douwe Maan | 2015-04-03 | 1 | -1/+2 |
| | | | |||||
| | * | Fix errors. | Douwe Maan | 2015-04-02 | 10 | -120/+114 |
| | | | |||||
| | * | Add changelog item. | Douwe Maan | 2015-04-02 | 1 | -0/+1 |
| | | | |||||
| | * | Only allow users to cross-reference and close issues they have access to. | Douwe Maan | 2015-04-02 | 5 | -12/+12 |
| | | | |||||
| | * | Only allow user to see participants from groups they have access to. | Douwe Maan | 2015-04-02 | 5 | -12/+12 |
| | | | |||||
| | * | Don't allow full access to guests in ReferenceExtractor | Douwe Maan | 2015-04-02 | 1 | -3/+0 |
| | | | |||||
| | * | 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 | 2 | -19/+16 |
| | | | |||||
| | * | Only allow user to reference objects they have access to. | Douwe Maan | 2015-04-02 | 3 | -22/+32 |
| | | | |||||
| | * | Slightly refactor ReferenceExtractor. | Douwe Maan | 2015-04-02 | 3 | -43/+41 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-13 | 5 | -2/+12 |
| |\ \ | |||||
| | * \ | Merge branch 'skip-email-reconfirmation' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -1/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip email confirmation when set by admin or via LDAP. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203. See merge request !494 | ||||
| | | * | | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation | Douwe Maan | 2015-04-06 | 3 | -1/+3 |
| | | | | | |||||
| | * | | | Merge branch 'shell-version-warning' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -1/+9 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495 | ||||
| | | * | | | Warn when gitlab-shell version doesn't match requirement.shell-version-warning | Douwe Maan | 2015-04-06 | 3 | -1/+9 |
| | | |/ / | |||||
| * | | | | Bump gitlab-shell version | Dmitriy Zaporozhets | 2015-04-13 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | 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 |
| | |\ \ \ | | | | | | | | | | | Fix issue9098 clean path | ||||
| | | * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/gitlabhq/gitlabhq/issues/9098 | ||||
| * | | | | | Fix performance issue when browse big diffs | Dmitriy Zaporozhets | 2015-04-13 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Merge branch 'public-deploy-keys' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 23 | -46/+386 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | Add admin deploy keys tests.public-deploy-keys | Douwe Maan | 2015-04-03 | 3 | -0/+81 |
| | | | | | | |||||
| | * | | | | Add project deploy keys tests. | Douwe Maan | 2015-04-03 | 2 | -3/+44 |
| | | | | | | |||||
| | * | | | | Clean up code. | Douwe Maan | 2015-04-03 | 7 | -27/+48 |
| | | | | | | |||||
| | * | | | | Fix failing specs. | Douwe Maan | 2015-04-03 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | Allow admin to create public deploy keys that are accessible to any project. | Douwe Maan | 2015-04-03 | 16 | -36/+233 |
| | | | | | | |||||
| * | | | | | Merge branch 'fix-group-project-list-cache' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 2 | -1/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bust group page project list cache when namespace name or path changes. Fixes gitlab-com/support-forum#144. See merge request !509 | ||||
| | * | | | | | Bust group page project list cache when namespace name or path changes.fix-group-project-list-cache | Douwe Maan | 2015-04-10 | 2 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9117 from bbodenmiller/patch-12 | Dmitriy Zaporozhets | 2015-04-12 | 1 | -3/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | document support for inline HTML | ||||
| | * | | | | | | document support for inline HTML | Ben Bodenmiller | 2015-04-11 | 1 | -3/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #9120 from bbodenmiller/patch-4 | Robert Schilling | 2015-04-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | fix link to details on how to run the tests | ||||
| | * | | | | | | | fix link to details on how to run the tests | Ben Bodenmiller | 2015-04-12 | 1 | -1/+1 |
| |/ / / / / / / | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | Merge branch 'arbitrary-local-repo-import' into 'master' | Dmitriy Zaporozhets | 2015-04-12 | 7 | -6/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent arbitary local repos from being imported. Fixes gitlab/gitlab-ee#263. See merge request !1763 | ||||
| | * | | | | | | | 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 ↵ | Douwe Maan | 2015-04-11 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imported. | ||||
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-12 | 3 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'fix-typo-starred-projects' into 'master' | Robert Schilling | 2015-04-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request !511 | ||||
| | | * | | | | | | | | Fix typo | Stan Hu | 2015-04-11 | 1 | -1/+1 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'bump-gitlab-shell' into 'master' | Douwe Maan | 2015-04-11 | 2 | -1/+2 |
| | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell Fix git over ssh errors 'fatal: protocol error: bad line length character' Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM @patricio See merge request !506 | ||||
| | | * | | | | | | | Bump gitlab-shell | Dmitriy Zaporozhets | 2015-04-09 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | | | Merge branch 'regex-start-of-string' into 'master' | Dmitriy Zaporozhets | 2015-04-12 | 11 | -16/+15 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix persistent XSS vulnerability around profile website URLs. Fixes gitlab/gitlab-ee#268 See merge request !1761 | ||||
| | * | | | | | | | | | Fix a whoopsie daisy in the changelog. | Douwe Maan | 2015-04-11 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |