Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 8.5.0-rc1v8.5.0-rc1 | Rémy Coutable | 2016-02-11 | 1 | -1/+1 |
* | Update CHANGELOG | Robert Speicher | 2016-02-09 | 1 | -0/+2 |
* | Merge branch 'freeze-constants-lib-gitlab-git' into 'master' | Robert Speicher | 2016-02-09 | 1 | -3/+3 |
|\ | |||||
| * | Freeze the expression instead of the literal | Zeger-Jan van de Weg | 2016-02-05 | 2 | -11/+1 |
| * | Minor refactoring on Gitlab::Git | Zeger-Jan van de Weg | 2016-02-05 | 2 | -3/+13 |
* | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' | Douwe Maan | 2016-02-09 | 4 | -16/+54 |
|\ \ | |||||
| * | | Smarter flushing of branch statistics caches | Yorick Peterse | 2016-02-09 | 4 | -16/+54 |
* | | | Merge remote-tracking branch 'github/master' into 'master' | Robert Speicher | 2016-02-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #10023 from bozaro/smtp-port | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Change default smpt port to 465 (default smtps port) | Artem V. Navrotskiy | 2016-02-09 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-02-09 | 37 | -220/+404 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ci-permissions' into 'master' | Robert Speicher | 2016-02-08 | 37 | -221/+405 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Fix commit status tests | Kamil Trzcinski | 2016-02-06 | 1 | -18/+30 |
| | * | | | | Remove current_user && when can? is used | Kamil Trzcinski | 2016-02-05 | 2 | -2/+2 |
| | * | | | | Merge branch 'master' into ci-permissions | Kamil Trzcinski | 2016-02-05 | 80 | -399/+958 |
| | |\ \ \ \ | |||||
| | * | | | | | Use `delete` instead of assignment operator when filtering build abilities | Kamil Trzcinski | 2016-02-04 | 1 | -1/+1 |
| | * | | | | | Update ability model after comments | Kamil Trzcinski | 2016-02-04 | 1 | -24/+15 |
| | * | | | | | Merge remote-tracking branch 'origin/master' into ci-permissions | Kamil Trzcinski | 2016-02-04 | 121 | -478/+1243 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Add behaviour tests for build permissions | Kamil Trzcinski | 2016-02-04 | 4 | -8/+56 |
| | * | | | | | | Rename allow_guest_to_access_builds to public_builds | Kamil Trzcinski | 2016-02-04 | 12 | -96/+202 |
| | * | | | | | | Expose allow_guest_to_access_builds in GitLab API | Kamil Trzcinski | 2016-02-04 | 3 | -5/+18 |
| | * | | | | | | Simplify abilities | Kamil Trzcinski | 2016-02-04 | 1 | -16/+23 |
| | * | | | | | | Properly handle commit status permissions (for a build) | Kamil Trzcinski | 2016-02-03 | 2 | -4/+26 |
| | * | | | | | | Fix build errors | Kamil Trzcinski | 2016-02-03 | 2 | -4/+8 |
| | * | | | | | | Clean Ci::ApplicationController from unused permission related code | Kamil Trzcinski | 2016-02-03 | 2 | -50/+2 |
| | * | | | | | | Add CI setting: allow_guest_to_access_builds | Kamil Trzcinski | 2016-02-02 | 6 | -25/+47 |
| | * | | | | | | Make the CI permission model simpler | Kamil Trzcinski | 2016-02-02 | 20 | -71/+78 |
* | | | | | | | | Merge branch 'index_snippet' into 'master' | Douwe Maan | 2016-02-09 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add index for snippet's updated_atindex_snippet | Valery Sizov | 2016-02-09 | 2 | -1/+7 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' | Douwe Maan | 2016-02-09 | 4 | -11/+118 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add an API spec for MergeRequest#merge_status and properly document this reso...develop7/add-merge_status-to-merge-request-in-api | Rémy Coutable | 2016-02-08 | 3 | -11/+117 |
| * | | | | | | | | Expose MergeRequest::merge_status to API | Andrei Dziahel | 2016-02-08 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'fix/max-attachment-size-setting-validation' | Douwe Maan | 2016-02-09 | 3 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Add Changelog entry for new maximum attachment size validatorfix/max-attachment-size-setting-validation | Grzegorz Bizon | 2016-02-09 | 1 | -0/+1 |
| * | | | | | | | | Validate maximum attachment size in application settings | Grzegorz Bizon | 2016-02-09 | 2 | -0/+12 |
* | | | | | | | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai... | Douwe Maan | 2016-02-09 | 10 | -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-mail | Jason Lee | 2016-02-09 | 10 | -0/+65 |
* | | | | | | | | | | Merge branch '3kami3/gitlab-ce-root_email' into 'master' | Douwe Maan | 2016-02-09 | 3 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email | 3kami3 | 2016-02-08 | 3 | -3/+6 |
* | | | | | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project' | Douwe Maan | 2016-02-09 | 3 | -1/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Validate uniqueness of milestone title per project | Zeger-Jan van de Weg | 2016-02-08 | 3 | -1/+16 |
* | | | | | | | | | | | Merge branch 'add-tooltip-to-stuck-builds' into 'master' | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add a tooltip to the stuck warning build symbol | Jeroen van Baarsen | 2016-02-08 | 1 | -1/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix/split-ci-jobs' into 'master' | Douwe Maan | 2016-02-09 | 1 | -4/+85 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | split gitlab-ci builds for ruby 2.1 | James Lopez | 2016-02-08 | 1 | -4/+85 |
* | | | | | | | | | | | Merge branch 'rs-broadcast-markdown' into 'master' | Douwe Maan | 2016-02-09 | 12 | -18/+87 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown | Robert Speicher | 2016-02-06 | 12 | -18/+87 |
* | | | | | | | | | | | Merge branch 'increase_import_timeout' into 'master' | Douwe Maan | 2016-02-09 | 3 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Increase project import timeout from 4 minutes to 15 minutes | Drew Blessing | 2016-02-04 | 3 | -2/+3 |
* | | | | | | | | | | | | Merge branch 'fix/atom-url-issue' into 'master' | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |