summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-14205-633/+1940
|
* Add a custom RSpec/SingleLineHook copRobert Speicher2017-06-141-0/+67
| | | | | This cop adds an offense when `before`, `after`, or `around` are used as single-line blocks.
* Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-144-2/+53
|\ | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * Help landing page customizationsRobin Bobbitt2017-06-144-2/+53
| |
* | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-148-2/+733
|\ \ | | | | | | | | | | | | | | | | | | Implement diff viewers Closes #30501 and #19931 See merge request !11777
| * | 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 service Closes gitlab-ee#2525 See merge request !12139
| * | 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 raw_path with the new job path, rename builds to jobs in test Closes #33149 See merge request !11941
| * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (34 commits) Revert "Merge branch 'karma-headless-chrome' into 'master'" Make small pipeline schedules UI enhancements. Remove js classes from vue component that are not needed in vue component Update tests and application Adds "Pipeline" to job's sidebar Change border color of job's scroll controllers to $border-color Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Added Tectonic to the page. Always check read_issue permissions when loading issue Handle legacy jobs without name Do not expose internal artifacts hash in build entity Use wait_for_requests instead of sleep 0.3 Limit wiki container width Fix migrations testing support RSpec hooks order Rename BuildEntity to JobEntity Fix support for external_url for commit statuses Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them add CHANGELOG.md entry for !12036 remove phantomjs-specific test hacks update karma job to use chrome build image created by gitlab-build-images!41 ...
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (460 commits) Center dropdown for pipeline's mini graph Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions Fix filename method of GitlabUploader to return always real filename Ignore CVE-2017-5029 in Nokogiri Refactor atom builder by using xml.atom layout Let PhantomJS load local images Add a changelog entry Only add a description change note when no tasks are updated Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) Use gitaly 0.11.2 Add the ability to perform background migrations Always render warnings icon in orange Fix a few translation for zh_TW Improve Job detail view to make it refreshed in real-time instead of reloading Attempts to run RSpec tests twice (1 retry) ignore name validation on importing Only show hover state on links and buttons Use vue files for navigation tabs and buttons doc: add example of scheduler when Add test for u2f helper and changelog entry ...
| * | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-063-194/+196
| | | | | | | | | | | | | | | | | | | | | | | | in the tests
* | | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-142-52/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise etag route regex miss Closes #33106 See merge request !12084
| * | | | | | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-52/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
* | | | | | | 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 ↵Filipa Lacerda2017-06-141-8/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport issue count badge style refactor for re-use from EE related issues See merge request !12152
| * | | | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added by https://gitlab.com/gitlab-org/gitlab-ee/commit/88aea2cbc8633ba970335d935d725bd17654b424 Part of this MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/
* | | | | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-1410-128/+414
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176
| * | | | | 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. Closes #32565 See merge request !12136
| * | | | | 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 component Closes #33642 See merge request !12133
| * | | | | 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
| |/ / / / |/| | | | | | | | | This reverts merge request !12036
* | | | | 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 entity Closes #33605 See merge request !12124
| * | | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposureGrzegorz Bizon2017-06-131-1/+1
| |/ / /
* | | | Merge branch ↵Yorick Peterse2017-06-134-1/+315
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32054-rails-should-use-timestamptz-database-type-for-postgresql' into 'master' Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Closes #32054 See merge request !11229
| * | | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-134-1/+315
| | | | | | | | | | | | | | | | | | | | 'timestamps_with_timezone'
* | | | | Merge branch 'zj-commit-status-sortable-name' into 'master'Grzegorz Bizon2017-06-131-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle legacy jobs without name Closes #33403 See merge request !12118
| * | | | | Handle legacy jobs without namezj-commit-status-sortable-nameZ.J. van de Weg2017-06-131-0/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403
* | | | | Merge branch 'fix/gb/fix-migrations-testing-support-hooks-order' into 'master'Sean McGivern2017-06-131-9/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migrations testing support RSpec hooks order Closes #33583 See merge request !12120
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Replace PhantomJS with headless Chrome in frontend test suite See merge request !12036
| * | | | 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 images See merge request !12003
| * | | Let PhantomJS load local imagesrc/load-images-in-phantomjsRémy Coutable2017-06-123-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fix a memory leak due to a Webkit bug: https://github.com/ariya/phantomjs/issues/12903 Also: - Whitelist only localhost and 127.0.0.1 in Capybara + JS specs - Blacklist all requests to media such as images, videos, PDFs, CSVs etc. - Log all the requests made. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | 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 unnecessary I/O Closes #33274 See merge request !11905
| * | | | Set artifact working directory to be in the destination store to prevent ↵sh-fix-refactor-uploader-work-dirStan Hu2017-06-063-19/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary I/O Similar to #33218, build artifacts were being uploaded into a CarrierWave temporary directory in the Rails root directory before moved to their final destination, which could cause a copy across filesystems. This merge request refactors the work in !11866 so that any uploader can just override `work_dir` to change the default implementation. Closes #33274
* | | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-122-1/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | | | | Add a feature spec for the performance barRémy Coutable2017-06-091-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>