summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-104-7/+35
* Merge branch 'rs-issue-13254' into 'master' Robert Speicher2016-02-101-1/+1
|\
| * Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
|/
* Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-093-3/+8
|\
| * Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-092-2/+7
| * Filter out variables from production logsKamil Trzcinski2016-02-091-1/+1
* | Merge branch 'fix-logo-rasterization' into 'master' Robert Speicher2016-02-092-21/+10
|\ \
| * | Prevent rasterization artefacts in the logo, and simplify markup.Aaron Hamilton2016-02-082-21/+10
* | | Update CHANGELOGRobert Speicher2016-02-091-0/+2
* | | Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher2016-02-091-3/+3
|\ \ \
| * | | Freeze the expression instead of the literalZeger-Jan van de Weg2016-02-052-11/+1
| * | | Minor refactoring on Gitlab::GitZeger-Jan van de Weg2016-02-052-3/+13
* | | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-094-16/+54
|\ \ \ \
| * | | | Smarter flushing of branch statistics cachesYorick Peterse2016-02-094-16/+54
* | | | | Merge remote-tracking branch 'github/master' into 'master'Robert Speicher2016-02-091-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #10023 from bozaro/smtp-portDouwe Maan2016-02-091-1/+1
| |\ \ \ \ \
| | * | | | | Change default smpt port to 465 (default smtps port)Artem V. Navrotskiy2016-02-091-1/+1
* | | | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0937-220/+404
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-0837-221/+405
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix commit status testsKamil Trzcinski2016-02-061-18/+30
| | * | | | | | Remove current_user && when can? is usedKamil Trzcinski2016-02-052-2/+2
| | * | | | | | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-0580-399/+958
| | |\ \ \ \ \ \
| | * | | | | | | Use `delete` instead of assignment operator when filtering build abilitiesKamil Trzcinski2016-02-041-1/+1
| | * | | | | | | Update ability model after commentsKamil Trzcinski2016-02-041-24/+15
| | * | | | | | | Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-04121-478/+1243
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add behaviour tests for build permissionsKamil Trzcinski2016-02-044-8/+56
| | * | | | | | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-0412-96/+202
| | * | | | | | | | Expose allow_guest_to_access_builds in GitLab APIKamil Trzcinski2016-02-043-5/+18
| | * | | | | | | | Simplify abilitiesKamil Trzcinski2016-02-041-16/+23
| | * | | | | | | | Properly handle commit status permissions (for a build)Kamil Trzcinski2016-02-032-4/+26
| | * | | | | | | | Fix build errorsKamil Trzcinski2016-02-032-4/+8
| | * | | | | | | | Clean Ci::ApplicationController from unused permission related codeKamil Trzcinski2016-02-032-50/+2
| | * | | | | | | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-026-25/+47
| | * | | | | | | | Make the CI permission model simplerKamil Trzcinski2016-02-0220-71/+78
* | | | | | | | | | Merge branch 'index_snippet' into 'master' Douwe Maan2016-02-092-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add index for snippet's updated_atindex_snippetValery Sizov2016-02-092-1/+7
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' Douwe Maan2016-02-094-11/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add an API spec for MergeRequest#merge_status and properly document this reso...develop7/add-merge_status-to-merge-request-in-apiRémy Coutable2016-02-083-11/+117
| * | | | | | | | | | Expose MergeRequest::merge_status to APIAndrei Dziahel2016-02-081-0/+1
* | | | | | | | | | | Merge branch 'fix/max-attachment-size-setting-validation'Douwe Maan2016-02-093-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Add Changelog entry for new maximum attachment size validatorfix/max-attachment-size-setting-validationGrzegorz Bizon2016-02-091-0/+1
| * | | | | | | | | | Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-092-0/+12
* | | | | | | | | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai...Douwe Maan2016-02-0910-0/+65
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-0910-0/+65
* | | | | | | | | | | | Merge branch '3kami3/gitlab-ce-root_email' into 'master' Douwe Maan2016-02-093-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email3kami32016-02-083-3/+6
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan2016-02-093-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Validate uniqueness of milestone title per projectZeger-Jan van de Weg2016-02-083-1/+16
* | | | | | | | | | | | Merge branch 'add-tooltip-to-stuck-builds' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add a tooltip to the stuck warning build symbolJeroen van Baarsen2016-02-081-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |