summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-135-5/+25
|
* 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
| | | | |
| * | | | Only add a description change note when no tasks are updatedJared Deckard2017-06-123-10/+42
| | | | |
| * | | | Fix incorrect spec descriptionJared Deckard2017-06-091-1/+1
| | | | |
* | | | | Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-128-0/+322
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to perform background migrations See merge request !11854
| * | | | | Add the ability to perform background migrationsYorick Peterse2017-06-128-0/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background migrations can be used to perform long running data migrations without these blocking a deployment procedure. See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for more information.
* | | | | | Merge branch 'retry-specs' into 'master'Robert Speicher2017-06-121-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to run RSpec tests twice (1 retry) See merge request !12066
| * | | | | | Attempts to run RSpec tests twice (1 retry)retry-specsRémy Coutable2017-06-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore commit status name validation on importing Closes #33490 See merge request !12039
| * | | | | | | ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'use-request-store-helper-instead-actual-code' into 'master'Douwe Maan2017-06-1210-82/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use :request_store hooks on specs See merge request !12058
| * | | | | | | Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-0910-82/+20
| | | | | | | |
* | | | | | | | Merge branch 'gitlab-workhorse-2.1.1' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-workhorse to v2.1.1 See merge request !12049
| * | | | | | | | Update gitlab-workhorse to v2.1.1Nick Thomas2017-06-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-zh_TW-00' into 'master'Douwe Maan2017-06-121-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few translation for zh_TW See merge request !12043
| * | | | | | | | | Fix a few translation for zh_TWfix-zh_TW-00Lin Jen-Shin2017-06-121-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
| * | | | | | | | | | Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'gitaly-0.11.2' into 'master'Stan Hu2017-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitaly 0.11.2 See merge request !12092
| * | | | | | | | | | Use gitaly 0.11.2Jacob Vosmaer2017-06-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) See merge request !12078
| * | | | | | | | | | | Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as ↵PAB2017-06-121-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
* | | | | | | | | | | Merge branch 'operau2f' into 'master'Rémy Coutable2017-06-123-1/+54
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082
| * | | | | | | | | | Add test for u2f helper and changelog entryJonas Kalderstam2017-06-112-0/+53
| | | | | | | | | | |
View Lorry Controller Status