summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-112-54/+67
* Merge branch 'display-mr-link-if-thre-is-one' into 'master' Douglas Barbosa Alexandre2016-02-105-9/+28
|\
| * Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-oneDouglas Barbosa Alexandre2016-02-102-2/+2
| * Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-105-9/+28
* | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into '...Robert Speicher2016-02-101-1/+4
|\ \
| * | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-1/+4
* | | Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' Robert Speicher2016-02-101-1/+2
|\ \ \ | |_|/ |/| |
| * | Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commitsTony Chu2016-02-081-1/+2
* | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-1013-50/+90
|\ \ \ | |_|/ |/| |
| * | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-095-8/+8
| * | More specific selectorsJosh Frye2016-02-091-4/+4
| * | MR feedbackJosh Frye2016-02-095-12/+9
| * | Extract events rendering to own action.Josh Frye2016-02-095-17/+21
| * | Starred, All, and Trending on explore are paged also group projects. Need aja...Josh Frye2016-02-097-14/+55
| * | JS FixesJosh Frye2016-02-092-14/+15
| * | Fix explore filter. Fixes #13182Josh Frye2016-02-093-24/+21
* | | 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-091-1/+3
|\ \ \
| * | | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+3
| | |/ | |/|
* | | 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
| |/ /
* | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-13/+17
|\ \ \
| * | | Smarter flushing of branch statistics cachesYorick Peterse2016-02-092-13/+17
* | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0918-114/+93
|\ \ \ \
| * \ \ \ Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-0818-114/+93
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove current_user && when can? is usedKamil Trzcinski2016-02-052-2/+2
| | * | | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-0565-338/+736
| | |\ \ \
| | * | | | 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-0462-316/+521
| | |\ \ \ \
| | * | | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-043-10/+10
| | * | | | | 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-023-8/+15
| | * | | | | Make the CI permission model simplerKamil Trzcinski2016-02-0215-52/+48
* | | | | | | Merge branch 'fix/max-attachment-size-setting-validation'Douwe Maan2016-02-091-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-091-0/+4
* | | | | | | Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mai...Douwe Maan2016-02-096-0/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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-096-0/+21
* | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Validate uniqueness of milestone title per projectZeger-Jan van de Weg2016-02-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | 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
| |/ / / / /
* | | | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-097-16/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-067-16/+47
* | | | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \
| * | | | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
* | | | | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-092-23/+27
|\ \ \ \ \ \ \
View Lorry Controller Status