summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixup! Allow custom text on 'almost there' page14098-customize-after-sign-up-pathSean McGivern2016-05-123-9/+12
* Allow custom text on 'almost there' pageSean McGivern2016-05-0910-1/+32
* Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-099-34/+89
|\
| * Expose MergeRequest#user_notes_count in the API and use the method in issues ...Rémy Coutable2016-05-097-45/+73
| * API: Expose Issue#user_notes_countcnam-dep2016-05-095-6/+33
* | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-096-48/+80
|\ \
| * | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-046-48/+80
* | | Merge branch 'fix-secret' into 'master' Rémy Coutable2016-05-091-1/+1
|\ \ \ | |_|/ |/| |
| * | Don't read otp_secret_encryption_key from hardcoded path in models/userJakub Jirutka2016-05-041-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-0938-81/+574
|\ \ \
| * \ \ Merge branch 'document-adding-instrumentation' into 'master' Rémy Coutable2016-05-091-6/+123
| |\ \ \
| | * | | Added documentation on how to instrument methodsdocument-adding-instrumentationYorick Peterse2016-05-051-6/+123
| * | | | Merge branch 'wiki-fix' into 'master' Rémy Coutable2016-05-095-4/+7
| |\ \ \ \
| | * | | | Use the proper GitLab URL for links in WikiArtem Sidorenko2016-05-095-4/+7
| * | | | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-096-7/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-086-7/+6
| * | | | | Merge branch 'improve-multiple-branch-push-performance' into 'master' Yorick Peterse2016-05-093-2/+8
| |\ \ \ \ \
| | * | | | | Improve multiple branch push performance by memoizing permission checkingStan Hu2016-05-093-2/+8
| * | | | | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-092-1/+53
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add tests for setting trusted_proxiestrusted-proxies-ip-addrDJ Mountney2016-05-041-0/+51
| | * | | | | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
| * | | | | | Merge branch 'escape-commit-titles' into 'master' Robert Speicher2016-05-083-1/+15
| |\ \ \ \ \ \
| | * | | | | | Escape HTML in commit titles in system note messagesStan Hu2016-05-073-1/+15
| * | | | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' Stan Hu2016-05-084-10/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Fix build notification on merge request page change even if the build status ...Benedikt Huss2016-05-084-10/+15
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'docs/adapt-user-api' into 'master' Achilleas Pipinellis2016-05-081-22/+58
| |\ \ \ \ \ \ \
| | * | | | | | | docs(api): adapted user API documentation to match with latest APIFabio Huser2016-05-061-22/+58
| * | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-05-081-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | blost -> blogBen Bodenmiller2016-05-061-1/+1
| * | | | | | | | | Merge branch 'update-doc-ci-examples' into 'master' Achilleas Pipinellis2016-05-083-9/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update CI example docs.Takuya Noguchi2016-05-073-9/+9
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'update-docker-hub-link' into 'master' Achilleas Pipinellis2016-05-087-17/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rename Docker with Docker Engine.Takuya Noguchi2016-05-072-4/+4
| | * | | | | | | | | Update Docker Hub links.Takuya Noguchi2016-05-076-13/+13
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'hiring' into 'master' Dmitriy Zaporozhets2016-05-081-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | We're hiring.hiringSytse Sijbrandij2016-05-061-0/+4
| * | | | | | | | | | Merge branch 'fix-sanitize-svg' into 'master' Robert Speicher2016-05-077-1/+258
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-067-1/+258
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge pull request #9953 from cmckni3/update-lfs-documentationAchilleas Pipinellis2016-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updates git lfs initialize commandChris McKnight2016-04-071-2/+2
* | | | | | | | | | | Update build triggers API documentation (#10153)Thomas Wood2016-05-081-1/+11
* | | | | | | | | | | Merge pull request #10330 from mortonfox/patch-1Achilleas Pipinellis2016-05-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update Subscription and EE linksMorton Fox2016-05-071-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'reduce-delete-delay' into 'master' Stan Hu2016-05-073-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Reduce delay in destroying a project from 1-minute to immediatelyStan Hu2016-05-073-3/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dz-improve-group-settings' into 'master' Dmitriy Zaporozhets2016-05-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Make group settings button white instead of gray for better visibilitydz-improve-group-settingsDmitriy Zaporozhets2016-05-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'nice-todos-bell' into 'master' Dmitriy Zaporozhets2016-05-063-1/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Add nice new Todo bellnice-todos-bellJacob Schatz2016-05-063-1/+10
* | | | | | | | | Merge branch 'dz-refactor-group-subnav' into 'master' Dmitriy Zaporozhets2016-05-062-40/+21
|\ \ \ \ \ \ \ \ \