summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-14205-633/+1940
* Add a custom RSpec/SingleLineHook copRobert Speicher2017-06-141-0/+67
* Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-144-2/+53
|\
| * Help landing page customizationsRobin Bobbitt2017-06-144-2/+53
* | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-148-2/+733
|\ \
| * | Implement diff viewersDouwe Maan2017-06-148-2/+733
* | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-143-32/+83
|\ \ \ | |/ / |/| |
| * | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-143-32/+83
* | | Merge branch '33149-rename-more-builds' into 'master'Kamil Trzciński2017-06-143-199/+201
|\ \ \
| * | | Fix other renamingLin Jen-Shin2017-06-141-1/+1
| * | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-1427-176/+898
| |\ \ \
| * | | | Fix other renamingLin Jen-Shin2017-06-141-11/+11
| * | | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-13221-1456/+5384
| |\ \ \ \
| * | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-063-194/+196
* | | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-142-52/+25
|\ \ \ \ \ \
| * | | | | | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-52/+25
* | | | | | | Move vue components to vue files and match docsFilipa Lacerda2017-06-147-7/+7
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'backport-related-issues-board-issue-count-badge-styles' into 'm...Filipa Lacerda2017-06-141-8/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-131-8/+8
* | | | | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-1410-128/+414
|\ \ \ \ \ \
| * | | | | | Improve specs for GitlabCiYamlProcessorTomasz Maczukin2017-06-121-50/+105
| * | | | | | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-121-0/+12
| * | | | | | Send new configuration options with job's payloadTomasz Maczukin2017-06-123-12/+60
| * | | | | | Add support for docker image configuration in .gitlab-ci.ymlTomasz Maczukin2017-06-126-73/+244
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-external-ci-services' into 'master'Grzegorz Bizon2017-06-149-24/+148
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-138-11/+114
| * | | | | Rename BuildEntity to JobEntityKamil Trzcinski2017-06-132-13/+34
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bpj-small-pipeline-ui-changes' into 'master'Annabel Dunstone Gray2017-06-131-1/+1
|\ \ \ \ \
| * | | | | Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changesBryce Johnson2017-06-131-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '33642-timeago-update' into 'master'Phil Hughes2017-06-131-12/+1
|\ \ \ \ \
| * | | | | Remove js classes from vue component that are not needed in vue component33642-timeago-updateFilipa Lacerda2017-06-131-12/+1
* | | | | | Revert "Merge branch 'karma-headless-chrome' into 'master'"Mike Greiling2017-06-136-11/+51
| |/ / / / |/| | | |
* | | | | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'Kamil Trzciński2017-06-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-1/+1
| |/ / /
* | | | Merge branch '32054-rails-should-use-timestamptz-database-type-for-postgresql...Yorick Peterse2017-06-134-1/+315
|\ \ \ \
| * | | | Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_time...32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-134-1/+315
* | | | | Merge branch 'zj-commit-status-sortable-name' into 'master'Grzegorz Bizon2017-06-131-0/+11
|\ \ \ \ \
| * | | | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-0/+11
| |/ / / /
* | | | | 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-136-51/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove phantomjs-specific test hacksMike Greiling2017-06-135-50/+10
| * | | | fix incorrect equals assertionMike Greiling2017-06-131-1/+1
| |/ / /
* | | | Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploaderKamil Trzcinski2017-06-132-2/+39
|/ / /
* | | Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-123-12/+9
|\ \ \
| * | | Let PhantomJS load local imagesrc/load-images-in-phantomjsRémy Coutable2017-06-123-12/+9
* | | | Merge branch 'sh-fix-refactor-uploader-work-dir' into 'master'Kamil Trzciński2017-06-123-19/+50
|\ \ \ \
| * | | | Set artifact working directory to be in the destination store to prevent unne...sh-fix-refactor-uploader-work-dirStan Hu2017-06-063-19/+50
* | | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-122-1/+82
|\ \ \ \ \
| * | | | | Add a feature spec for the performance barRémy Coutable2017-06-091-0/+81