diff options
| author |   Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:09:22 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:09:22 +0100 |
| commit | c755aa91e82852d2c81569ddf173900c93106f91 (patch) | |
| tree | c0d2b1c71096d1aae6326c54fb836e1e1a94232b /.gitignore | |
| parent | Merge branch 'develop-ascraeus' into develop (diff) | |
| parent | Merge pull request #3065 from dhruvgoel92/feature/phantom (diff) | |
| download | phpbb-c755aa91e82852d2c81569ddf173900c93106f91.tar.gz phpbb-c755aa91e82852d2c81569ddf173900c93106f91.tar.bz2 phpbb-c755aa91e82852d2c81569ddf173900c93106f91.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12962] Rename setup-phpbb-test
[ticket/12962] Use phpVersion in phpunit.xml
[ticket/12962] Functional tests run for php <5.3.19
[ticket/12962] Clean up composer.json
[ticket/12962] Fix Line Endings in bootstrap
[ticket/12962] Load composer test dependencies for php >= 5.3.19
[ticket/12962] bootstrap functional and ui test when php >5.3.19
[ticket/12962] Install test dependencies on travis
[ticket/12962] Add facebook/webdriver dependency
[ticket/12962] Fix whitespace characters
[ticket/12962] Run tests for all databases on Travis
[ticket/12962] Force language=en for UI tests installation
[ticket/12962] Dump server output to /dev/null
[ticket/12962] Start phantomjs on travis in background
[ticket/12962] Mark test skipped when phantom server not running
[ticket/12962] Add setup-phantomjs-server.sh
[ticket/12962] Run UI tests on Travis-mysql
[ticket/12962] Add UI tests to phpunit.xml.dist
[ticket/12962] Add quick-links JS test
[ticket/12962] Add initial class for ui_testing
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8bb9f76a49..67e0563a19 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /tests/phpbb_unit_tests.sqlite* /tests/test_config*.php /tests/tmp/* +/tests/vendor |