Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move note helper method to notes entity fileissue_17302 | Felipe Artur | 2016-05-17 | 2 | -6/+8 |
* | Fix single note api request | Felipe Artur | 2016-05-16 | 3 | -8/+23 |
* | Fix notes API calls symbol convertions | Felipe Artur | 2016-05-10 | 2 | -3/+34 |
* | Fix api leaking notes when user is not authorized to read noteable | Felipe Artur | 2016-05-09 | 3 | -13/+38 |
* | Merge branch 'revert-450ea01d' into 'master' | Achilleas Pipinellis | 2016-05-09 | 1 | -5/+5 |
|\ | |||||
| * | Revert "Merge branch 'patch-1' into 'master'" | Rémy Coutable | 2016-05-09 | 1 | -5/+5 |
* | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' | Douwe Maan | 2016-05-09 | 3 | -2/+22 |
|\ \ | |||||
| * | | Fix adding a todo for private group members | Ahmad Sherif | 2016-05-07 | 3 | -2/+22 |
* | | | Merge branch 'cascade_drop' into 'master' | Robert Speicher | 2016-05-09 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Add if exists to drop command | Drew Blessing | 2016-05-09 | 1 | -1/+3 |
* | | | | Merge branch 'issue_15394' into 'master' | Rémy Coutable | 2016-05-09 | 6 | -1/+26 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Make model sanitization methods one liners | Felipe Artur | 2016-05-09 | 3 | -6/+5 |
| * | | | Sanitize milestones and label titlesissue_15394 | Felipe Artur | 2016-05-05 | 5 | -1/+27 |
* | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' | Rémy Coutable | 2016-05-09 | 9 | -34/+89 |
|\ \ \ \ | |||||
| * | | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ... | Rémy Coutable | 2016-05-09 | 7 | -45/+73 |
| * | | | | API: Expose Issue#user_notes_count | cnam-dep | 2016-05-09 | 5 | -6/+33 |
* | | | | | Merge branch 'rs-backport-ee-372' into 'master' | Rémy Coutable | 2016-05-09 | 6 | -48/+80 |
|\ \ \ \ \ | |||||
| * | | | | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372 | Robert Speicher | 2016-05-04 | 6 | -48/+80 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fix-secret' into 'master' | Rémy Coutable | 2016-05-09 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Don't read otp_secret_encryption_key from hardcoded path in models/user | Jakub Jirutka | 2016-05-04 | 1 | -1/+1 |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-05-09 | 38 | -81/+574 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'document-adding-instrumentation' into 'master' | Rémy Coutable | 2016-05-09 | 1 | -6/+123 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added documentation on how to instrument methodsdocument-adding-instrumentation | Yorick Peterse | 2016-05-05 | 1 | -6/+123 |
| * | | | | | | Merge branch 'wiki-fix' into 'master' | Rémy Coutable | 2016-05-09 | 5 | -4/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Use the proper GitLab URL for links in Wiki | Artem Sidorenko | 2016-05-09 | 5 | -4/+7 |
| * | | | | | | | Merge branch 'rs-remove-wall_enabled' into 'master' | Dmitriy Zaporozhets | 2016-05-09 | 6 | -7/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabled | Robert Speicher | 2016-05-08 | 6 | -7/+6 |
| * | | | | | | | Merge branch 'improve-multiple-branch-push-performance' into 'master' | Yorick Peterse | 2016-05-09 | 3 | -2/+8 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Improve multiple branch push performance by memoizing permission checking | Stan Hu | 2016-05-09 | 3 | -2/+8 |
| * | | | | | | | | Merge branch 'trusted-proxies-ip-addr' into 'master' | Rémy Coutable | 2016-05-09 | 2 | -1/+53 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Add tests for setting trusted_proxiestrusted-proxies-ip-addr | DJ Mountney | 2016-05-04 | 1 | -0/+51 |
| | * | | | | | | | Pass trusted_proxies to action_dispatch as IPAddrs instead of strings | DJ Mountney | 2016-04-28 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'escape-commit-titles' into 'master' | Robert Speicher | 2016-05-08 | 3 | -1/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Escape HTML in commit titles in system note messages | Stan Hu | 2016-05-07 | 3 | -1/+15 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' | Stan Hu | 2016-05-08 | 4 | -10/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix build notification on merge request page change even if the build status ... | Benedikt Huss | 2016-05-08 | 4 | -10/+15 |
| | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'docs/adapt-user-api' into 'master' | Achilleas Pipinellis | 2016-05-08 | 1 | -22/+58 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | docs(api): adapted user API documentation to match with latest API | Fabio Huser | 2016-05-06 | 1 | -22/+58 |
| * | | | | | | | | | Merge branch 'patch-3' into 'master' | Achilleas Pipinellis | 2016-05-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | blost -> blog | Ben Bodenmiller | 2016-05-06 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'update-doc-ci-examples' into 'master' | Achilleas Pipinellis | 2016-05-08 | 3 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Update CI example docs. | Takuya Noguchi | 2016-05-07 | 3 | -9/+9 |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'update-docker-hub-link' into 'master' | Achilleas Pipinellis | 2016-05-08 | 7 | -17/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Rename Docker with Docker Engine. | Takuya Noguchi | 2016-05-07 | 2 | -4/+4 |
| | * | | | | | | | | | | Update Docker Hub links. | Takuya Noguchi | 2016-05-07 | 6 | -13/+13 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'hiring' into 'master' | Dmitriy Zaporozhets | 2016-05-08 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | We're hiring.hiring | Sytse Sijbrandij | 2016-05-06 | 1 | -0/+4 |
| * | | | | | | | | | | | Merge branch 'fix-sanitize-svg' into 'master' | Robert Speicher | 2016-05-07 | 7 | -1/+258 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Update SVG sanitizer to conform to SVG 1.1 | Stan Hu | 2016-05-06 | 7 | -1/+258 |
| | | |/ / / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #9953 from cmckni3/update-lfs-documentation | Achilleas Pipinellis | 2016-05-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |