summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert unrelevant changespipeline-hooks-without-slackKamil Trzcinski2016-08-163-22/+18
* Make rubocop happyKamil Trzcinski2016-08-151-9/+9
* Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1531-221/+853
|\
| * This fixes a long running tests due to changed Sidekiq statefix-failing-testsKamil Trzcinski2016-08-153-14/+17
| * Merge branch 'feature/test-coverage-badge' into 'master' Douwe Maan2016-08-1527-177/+807
| |\
| | * Add Changelog entry for test coverage report badgefeature/test-coverage-badgeGrzegorz Bizon2016-08-151-0/+1
| | * Add documentation for test coverage report badgeGrzegorz Bizon2016-08-152-10/+37
| | * Add feature specs for test coverage badgeGrzegorz Bizon2016-08-151-0/+73
| | * Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-152-5/+5
| | * Render collection of badges instead of using iteratorGrzegorz Bizon2016-08-153-29/+28
| | * Extract pipeline badges to the separate view partialGrzegorz Bizon2016-08-152-28/+29
| | * Expose coverage report badge in pipeline settingsGrzegorz Bizon2016-08-153-39/+67
| | * Add method for coverage badge in badges controllerGrzegorz Bizon2016-08-151-2/+15
| | * Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-152-0/+20
| | * Extract base abstract template for badgesGrzegorz Bizon2016-08-153-35/+51
| | * Add template class for coverage report badgeGrzegorz Bizon2016-08-152-0/+199
| | * Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-155-22/+54
| | * Add coverage report badge metadata classGrzegorz Bizon2016-08-153-1/+66
| | * Extract common badge metadata test examplesGrzegorz Bizon2016-08-152-19/+23
| | * Implement the main class of test coverage badgeGrzegorz Bizon2016-08-152-9/+98
| | * Refactor badge template and metadata classesGrzegorz Bizon2016-08-157-58/+58
| | * Move badges to separate modules and add base classGrzegorz Bizon2016-08-1511-55/+82
| | * Add empty test coverage badge class and specsGrzegorz Bizon2016-08-152-0/+36
| * | Merge branch 'fix/build-seeds-in-development-environment' into 'master' Grzegorz Bizon2016-08-151-30/+29
| |\ \
| | * | Fix pipeline and build seeds in development environmentGrzegorz Bizon2016-08-151-30/+29
* | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1558-131/+619
|\ \ \ \ | |/ / /
| * | | Merge branch 'ee-parity' into 'master' Robert Speicher2016-08-151-0/+4
| |\ \ \
| | * | | Add method missing from EEee-parityAlejandro Rodríguez2016-08-121-0/+4
| * | | | 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
| | |/ / /