summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update contribution acceptance criteria with tests requirementsdz-test-requiredDmitriy Zaporozhets2016-08-191-3/+2
* Add test requirement for new filesDmitriy Zaporozhets2016-08-151-1/+3
* Merge branch 'zj-deployment-status-on-mr' into 'master' Douwe Maan2016-08-1511-2/+137
|\
| * Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-1210-29/+60
| * CI build status not per environmentZ.J. van de Weg2016-08-114-22/+24
| * Incorporate feedbackZ.J. van de Weg2016-08-118-9/+56
| * Tests for release status heading on MR#showZ.J. van de Weg2016-08-112-2/+25
| * Show deployment status on a MR viewZ.J. van de Weg2016-08-115-14/+46
* | Merge branch 'svg-render-size-limit' into 'master' Douwe Maan2016-08-154-5/+41
|\ \
| * | Limit the size of SVGs when viewing them as blobssvg-render-size-limitYorick Peterse2016-08-154-5/+41
* | | Merge branch 'new-phantomjs-version' into 'master' Jacob Schatz2016-08-1524-36/+93
|\ \ \
| * | | Used phantomjs variablenew-phantomjs-versionPhil Hughes2016-08-151-1/+1
| * | | Update phantomjs linkAlfredo Sumaran2016-08-131-1/+1
| * | | Remove sleeping and replace escaped text.Connor Shea2016-08-132-8/+8
| * | | Filters test fixPhil Hughes2016-08-131-3/+6
| * | | Fixed filtering testsPhil Hughes2016-08-132-13/+5
| * | | Removed screenshot command :poop:Phil Hughes2016-08-131-3/+0
| * | | Updated failing testsPhil Hughes2016-08-135-7/+27
| * | | Used mirrored version on GitLabPhil Hughes2016-08-131-1/+1
| * | | Updated testsPhil Hughes2016-08-1318-11/+46
| * | | Fix `U2fSpec` for PhantomJS versions > 2.Timothy Andrew2016-08-131-12/+20
| * | | Fix file downloadingKamil Trzcinski2016-08-131-1/+1
| * | | Install latest stable phantomjsKamil Trzcinski2016-08-132-4/+5
| * | | Use new PhantomJS versionKamil Trzcinski2016-08-132-3/+4
| |/ /
* | | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-158-12/+60
|\ \ \
| * | | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-125-9/+44
| * | | Use cache for todos counter calling TodoServicePaco Guzman2016-08-124-3/+16
* | | | Merge branch 'fix/slow-todos' into 'master' Yorick Peterse2016-08-154-67/+30
|\ \ \ \
| * | | | Add a spec for ProjectsFinder project_ids_relation optionAhmad Sherif2016-08-151-0/+8
| * | | | Fix ProjectsFinder specAhmad Sherif2016-08-151-57/+12
| * | | | 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-153-11/+13
|/ / / /
* | | | Merge branch 'change-access-update' into 'master' Yorick Peterse2016-08-152-1/+100
|\ \ \ \
| * | | | Change the order of the access rules to check simpler first, and add specschange-access-updateAlejandro Rodríguez2016-08-122-1/+100
* | | | | Merge branch 'pivotaltracker-restrict-branch' into 'master' Jeroen van Baarsen2016-08-154-6/+101
|\ \ \ \ \
| * | | | | Ability to specify branches for pivotal tracker integrationEgor Lynko2016-08-154-6/+101
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/sanitization-filter-leak' into 'master' Yorick Peterse2016-08-152-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a memory leak caused by Banzai::Filter::SanitizationFilterfix/sanitization-filter-leakAhmad Sherif2016-08-142-1/+4
|/ / / /
* | | | Merge branch 'push-mr-url-guards' into 'master' Douwe Maan2016-08-122-1/+46
|\ \ \ \
| * | | | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-122-1/+46
| |/ / /
* | | | Merge branch 'archived_project_badge' into 'master' Rémy Coutable2016-08-122-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add archived badge to project listingDrew Blessing2016-08-122-0/+3
|/ / /
* | | Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-1216-34/+179
|\ \ \
| * | | Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-1116-34/+179
* | | | Merge branch 'ruby-2-3-1' into 'master' Douwe Maan2016-08-121-2/+2
|\ \ \ \
| * | | | Update ruby 2.3.1ruby-2-3-1Z.J. van de Weg2016-08-121-2/+2
* | | | | 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