summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Limit wiki container widthwiki-limited-widthPhil Hughes2017-06-1310-152/+149
* 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 ...blackst0ne2017-06-132-1/+6
* | Merge branch 'fix-filename-of-artifact-uploader' into 'master'Grzegorz Bizon2017-06-133-2/+43
|\ \ | |/ |/|
| * 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 Nokogiriwinh2017-06-121-1/+1
* | Merge branch 'rc/load-images-in-phantomjs' into 'master'Robert Speicher2017-06-124-13/+12
|\ \
| * | Let PhantomJS load local imagesrc/load-images-in-phantomjsRémy Coutable2017-06-124-13/+12
* | | 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 unne...sh-fix-refactor-uploader-work-dirStan Hu2017-06-067-31/+77
* | | | Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-1227-2/+771
|\ \ \ \
| * | | | DRYed peek-pg/mysql2 views and update peek-rblineprof monkey-patch file29010-perf-barRémy Coutable2017-06-094-47/+33
| * | | | Fix peek-rblineprof JSRémy Coutable2017-06-091-1/+1
| * | | | Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-093-0/+40
| * | | | Add a feature spec for the performance barRémy Coutable2017-06-091-0/+81
| * | | | Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-092-3/+2
| * | | | Fix linting, route, and specsRémy Coutable2017-06-097-18/+12
| * | | | Improve the JS for the `p b` shortcut and fix its CSSRémy Coutable2017-06-092-8/+4
| * | | | Fix spec failures and add a feature flag for the performance barRémy Coutable2017-06-093-6/+11
| * | | | Add `p b` to the shortcuts documentationRémy Coutable2017-06-092-1/+4
| * | | | Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-098-63/+53
| * | | | Add CHANGELOG entryRémy Coutable2017-06-091-0/+4
| * | | | Small adjustmentsRémy Coutable2017-06-094-259/+3
| * | | | Display queries duration in performance bar queries modalRémy Coutable2017-06-094-80/+34
| * | | | Improve UI of the performance barRémy Coutable2017-06-093-10/+20
| * | | | Fix replacement of Pygments with RougeRémy Coutable2017-06-094-9/+7
| * | | | Replace Tipsy by Bootstrap's tooltipsRémy Coutable2017-06-094-55/+10
| * | | | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-095-6/+100
| * | | | Tweak Peek to display SQL queriesRémy Coutable2017-06-094-30/+52
| * | | | Store Sherlock::Query in Peek adapterRémy Coutable2017-06-093-0/+104
| * | | | New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-0918-1/+791
* | | | | Merge branch '32834-task-note-only' into 'master'Sean McGivern2017-06-125-11/+47
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 migrationsYorick Peterse2017-06-128-0/+322
* | | | | | Merge branch 'retry-specs' into 'master'Robert Speicher2017-06-121-3/+2
|\ \ \ \ \ \
| * | | | | | Attempts to run RSpec tests twice (1 retry)retry-specsRémy Coutable2017-06-121-3/+2
* | | | | | | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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 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.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_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-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |