summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix frontend test failures after jasmine upgradekarma-headless-chrome-reduxMike Greiling2017-06-152-3/+3
* remove debug flag, but continue to log chrome outputMike Greiling2017-06-141-1/+1
* upgrade jasmine to attempt to resolve browser timeout issuesMike Greiling2017-06-142-17/+11
* add DEBUG flag option to karma configMike Greiling2017-06-142-6/+20
* run chrome with --no-sandbox flag to get around docker privilege limitationsMike Greiling2017-06-142-7/+5
* upgrade karma to v1.7.0Mike Greiling2017-06-142-72/+70
* force chrome to produce debug output as it runs in CIMike Greiling2017-06-142-1/+12
* add CHANGELOG.md entry for !12036Mike Greiling2017-06-141-0/+4
* remove phantomjs-specific test hacksMike Greiling2017-06-145-50/+10
* update karma job to use chrome build image created by gitlab-build-images!41Mike Greiling2017-06-141-1/+1
* test new docker image with headless chromeMike Greiling2017-06-141-0/+1
* remove phantomjs from our frontend dev dependenciesMike Greiling2017-06-142-118/+8
* fix incorrect equals assertionMike Greiling2017-06-141-1/+1
* replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-143-2/+20
* Merge branch '33628-pipeline-sidebar' into 'master'Phil Hughes2017-06-131-0/+1
|\
| * Adds "Pipeline" to job's sidebar33628-pipeline-sidebarFilipa Lacerda2017-06-131-0/+1
* | Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-132-26/+3
|\ \
| * | Remove js classes from vue component that are not needed in vue component33642-timeago-updateFilipa Lacerda2017-06-132-26/+3
| |/
* | Merge branch 'revert-1b54982f' into 'master'Robert Speicher2017-06-1311-41/+168
|\ \
| * | Revert "Merge branch 'karma-headless-chrome' into 'master'"Mike Greiling2017-06-1311-41/+168
* | | Merge branch 'wiki-limited-width' into 'master'Annabel Dunstone Gray2017-06-1310-152/+149
|\ \ \ | |/ / |/| |
| * | Limit wiki container widthwiki-limited-widthPhil Hughes2017-06-1310-152/+149
* | | Merge branch '33629-scroll-color' into 'master'Phil Hughes2017-06-131-1/+1
|\ \ \
| * | | Change border color of job's scroll controllers to $border-colorFilipa Lacerda2017-06-131-1/+1
| | |/ | |/|
* | | Merge branch 'tidy-up-issues-controller-filters' into 'master'Douwe Maan2017-06-131-9/+6
|\ \ \
| * | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
* | | | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-132-6/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-132-6/+3
* | | | Merge branch 'fix-github-clone-wiki' into 'master'Sean McGivern2017-06-132-1/+5
|\ \ \ \
| * | | | Add CHANGELOGfix-github-clone-wikiDouglas Barbosa Alexandre2017-06-121-0/+4
| * | | | Github - Fix token interpolation when cloning wiki repositoryDouglas Barbosa Alexandre2017-06-121-1/+1
| | |/ / | |/| |
* | | | Merge branch '32054-rails-should-use-timestamptz-database-type-for-postgresql...Yorick Peterse2017-06-1349-3/+569
|\ \ \ \
| * | | | Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_time...32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-1349-3/+569
* | | | | Merge branch 'zj-commit-status-sortable-name' into 'master'Grzegorz Bizon2017-06-133-2/+17
|\ \ \ \ \
| * | | | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-133-2/+17
| |/ / / /
* | | | | Merge branch 'updating-k8s-page' into 'master'Phil Hughes2017-06-131-1/+1
|\ \ \ \ \
| * | | | | Added Tectonic to the page.updating-k8s-pageEliran Mesika2017-06-131-1/+1
|/ / / / /
* | | | | Merge branch '33564-fix-flaky-test' into 'master'Sean McGivern2017-06-131-2/+2
|\ \ \ \ \
| * | | | | Use wait_for_requests instead of sleep 0.3Rémy Coutable2017-06-131-2/+2
* | | | | | Merge branch 'fix/gb/fix-migrations-testing-support-hooks-order' into 'master'Sean McGivern2017-06-131-9/+7
|\ \ \ \ \ \
| * | | | | | Fix migrations testing support RSpec hooks orderfix/gb/fix-migrations-testing-support-hooks-orderGrzegorz Bizon2017-06-131-9/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'karma-headless-chrome' into 'master'Tim Zallmann2017-06-1311-168/+41
|\ \ \ \ \ \
| * | | | | | add CHANGELOG.md entry for !12036karma-headless-chromeMike Greiling2017-06-131-0/+4
| * | | | | | remove phantomjs-specific test hacksMike Greiling2017-06-135-50/+10
| * | | | | | update karma job to use chrome build image created by gitlab-build-images!41Mike Greiling2017-06-131-1/+1
| * | | | | | test new docker image with headless chromeMike Greiling2017-06-131-0/+1
| * | | | | | remove phantomjs from our frontend dev dependenciesMike Greiling2017-06-132-118/+8
| * | | | | | fix incorrect equals assertionMike Greiling2017-06-131-1/+1
| * | | | | | replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-133-2/+20
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '27586-center-dropdown' into 'master'Phil Hughes2017-06-132-1/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |