summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.3 Closes #33564 See merge request !12122
| * Use wait_for_requests instead of sleep 0.3Rémy Coutable2017-06-131-2/+2
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | 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-1311-168/+41
|\ \ \ | | | | | | | | | | | | | | | | Replace PhantomJS with headless Chrome in frontend test suite See merge request !12036
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Center dropdown for pipeline's mini graph Closes #27586 See merge request !12087
| * | | Center dropdown for pipeline's mini graphFilipa Lacerda2017-06-132-1/+14
|/ / /
* | | Merge branch 'fix/33584-atom-layout' into 'master'Rémy Coutable2017-06-1316-79/+59
|\ \ \ | | | | | | | | | | | | | | | | Refactor atom builder by using a layout See merge request !12114
| * | | Refactor atom builder by using xml.atom layoutTieu-Philippe KHIM2017-06-1216-79/+59
| | | |
* | | | Merge branch 'fix_docs_commits_multiple_files' into 'master'Rémy Coutable2017-06-132-1/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions See merge request !12117
| * | | Documentation bugfix of invalid JSON payload example of Create a commit with ↵blackst0ne2017-06-132-1/+6
| | |/ | |/| | | | | | | multiple files and actions
* | | Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-133-2/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix filename method of GitlabUploader to return always real filename Closes #33524 See merge request !12113
| * | Fix filename method of GitlabUploader to return always real filenamefix-filename-of-artifact-uploaderKamil Trzcinski2017-06-133-2/+43
| | |
* | | Merge branch 'winh-ignore-CVE-2017-5029' into 'master'Robert Speicher2017-06-121-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Ignore CVE-2017-5029 in Nokogiri Closes #33597 See merge request !12109
| * | Ignore CVE-2017-5029 in Nokogiriwinh2017-06-121-1/+1
| | |
* | | Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-124-13/+12
|\ \ \ | | | | | | | | | | | | | | | | Let PhantomJS load local images See merge request !12003
| * | | Let PhantomJS load local imagesrc/load-images-in-phantomjsRémy Coutable2017-06-124-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-127-31/+77
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-067-31/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1227-2/+771
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * | | | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-094-47/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix peek-rblineprof JSRémy Coutable2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-093-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Add a feature spec for the performance barRémy Coutable2017-06-091-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-092-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix linting, route, and specsRémy Coutable2017-06-097-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-092-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-093-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Add `p b` to the shortcuts documentationRémy Coutable2017-06-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-098-63/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Add CHANGELOG entryRémy Coutable2017-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Small adjustmentsRémy Coutable2017-06-094-259/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Display queries duration in performance bar queries modalRémy Coutable2017-06-094-80/+34
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Improve UI of the performance barRémy Coutable2017-06-093-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix replacement of Pygments with RougeRémy Coutable2017-06-094-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Replace Tipsy by Bootstrap's tooltipsRémy Coutable2017-06-094-55/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-095-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Tweak Peek to display SQL queriesRémy Coutable2017-06-094-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Store Sherlock::Query in Peek adapterRémy Coutable2017-06-093-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-0918-1/+791
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '32834-task-note-only' into 'master'Sean McGivern2017-06-125-11/+47
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Description Change Notes When Toggling Tasks Closes #32834 See merge request !12057
| * | | | | Add a changelog entryJared Deckard2017-06-121-0/+4
| | | | | |
View Lorry Controller Status