summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-155-1/+37
|\ \ \ \ \
| * | | | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-125-9/+16
| * | | | | CI build status not per environmentZ.J. van de Weg2016-08-111-19/+17
| * | | | | Incorporate feedbackZ.J. van de Weg2016-08-113-6/+6
| * | | | | Tests for release status heading on MR#showZ.J. van de Weg2016-08-111-2/+2
| * | | | | Show deployment status on a MR viewZ.J. van de Weg2016-08-114-14/+45
* | | | | | Merge branch 'svg-render-size-limit' into 'master' Douwe Maan2016-08-152-5/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-152-5/+18
| | |/ / / | |/| | |
* | | | | Merge branch 'new-phantomjs-version' into 'master' Jacob Schatz2016-08-151-7/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Updated failing testsPhil Hughes2016-08-131-7/+4
| |/ / /
* | | | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-154-7/+8
|\ \ \ \
| * | | | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-123-5/+6
| * | | | Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-2/+2
* | | | | Pass project IDs relation to ProjectsFinder instead of using a blockAhmad Sherif2016-08-152-5/+3
* | | | | Speed up todos queries by limiting the projects set we join withAhmad Sherif2016-08-152-11/+12
* | | | | Ability to specify branches for pivotal tracker integrationEgor Lynko2016-08-151-4/+27
| |/ / / |/| | |
* | | | Merge branch 'push-mr-url-guards' into 'master' Douwe Maan2016-08-121-1/+12
|\ \ \ \
| * | | | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-121-1/+12
* | | | | Add archived badge to project listingDrew Blessing2016-08-121-0/+2
|/ / / /
* | | | Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-126-8/+42
|\ \ \ \
| * | | | Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-116-8/+42
* | | | | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-128-14/+52
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add gravatars to build history20059-environment-listAnnabel Dunstone2016-08-083-3/+4
| * | | | Add deployment ID and gravatar to environments pageAnnabel Dunstone2016-08-083-4/+8
| * | | | Format environment history pageAnnabel Dunstone2016-08-081-2/+2
| * | | | Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-085-9/+25
| * | | | Style deploy buttonAnnabel Dunstone2016-08-082-3/+20
* | | | | Merge branch 'improve-pipeline-processing' into 'master' Rémy Coutable2016-08-125-46/+93
|\ \ \ \ \
| * | | | | Improve transition between states for event `enqueue`Kamil Trzcinski2016-08-121-1/+1
| * | | | | Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-124-17/+11
| * | | | | Fix test failuresKamil Trzcinski2016-08-121-1/+1
| * | | | | Added specs for started_at and finished_atKamil Trzcinski2016-08-121-7/+8
| * | | | | Use explicit events to transition between statesKamil Trzcinski2016-08-122-13/+33
| * | | | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-121-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-129-15/+62
| |\ \ \ \ \
| * | | | | | Fix test failures, that did occur because of missing previously used `reload_...Kamil Trzcinski2016-08-112-28/+27
| * | | | | | Use state machine for pipeline event processingKamil Trzcinski2016-08-113-24/+50
| * | | | | | Verify the pipeline status after executing events on buildsKamil Trzcinski2016-08-112-1/+8
* | | | | | | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
* | | | | | | render only commit titleubudzisz2016-08-111-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'feature/merge-request-link-after-push' into 'master' Douwe Maan2016-08-112-0/+53
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | api for generating new merge requestScott Le2016-08-112-0/+53
* | | | | | Merge branch '20614-show-member-roles-to-all-users' into 'master' Robert Speicher2016-08-112-7/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-112-7/+1
| | |/ / / | |/| | |
* | | | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-115-8/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-115-8/+8
* | | | | Merge branch 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-115-104/+366
|\ \ \ \ \
| * | | | | Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-101-7/+3
| * | | | | Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3