summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix unit testsfix-base64-encoded-file-uploadsjerasmus2018-10-181-8/+10
* Add file type to mock filejerasmus2018-10-181-2/+3
* Add file types to unit testsjerasmus2018-10-181-0/+2
* Pretty print changed filesjerasmus2018-10-182-4/+2
* Add changelog entryjerasmus2018-10-181-0/+5
* Add null-safe check on encoded contentjerasmus2018-10-181-2/+2
* Updated the `isText` method to test for file typesjerasmus2018-10-181-3/+18
* Update unit test descriptionjerasmus2018-10-181-1/+1
* Add regex to test file contents for non-ascii charactersjerasmus2018-10-171-3/+7
* Cleanup createFile methodjerasmus2018-10-171-5/+5
* Update unit tests for file uploadsjerasmus2018-10-171-18/+8
* Determine if the file that is being uploaded contains plain textjerasmus2018-10-171-13/+7
* Merge branch 'prettify-all-the-things-8' into 'master'Fatih Acet2018-10-1650-1051/+1330
|\
| * Prettify additional modules (I through Z)Mike Greiling2018-10-1650-1051/+1330
* | Merge branch 'prettify-all-the-things-1' into 'master'Fatih Acet2018-10-1676-1029/+1138
|\ \
| * | Prettify environments feature_highlight and filtered_search modulesMike Greiling2018-10-1622-405/+459
| * | Prettify diff_notes diffs and droplab modulesMike Greiling2018-10-1618-136/+172
| * | Prettify blob behaviors and cycle_analytics modulesMike Greiling2018-10-1636-488/+507
| |/
* | Merge branch '49740-share-frontend-configs-between-repos' into 'master'Clement Ho2018-10-163-46/+19
|\ \
| * | Use @gitlab/eslint-config as base in eslintrcMike Greiling2018-10-163-46/+19
* | | Merge branch '51712-no-promise-without-done-fail' into 'master'Mike Greiling2018-10-167-19/+17
|\ \ \ | |/ / |/| |
| * | enable jasmine/no-promise-without-done-failJohann Hubert Sonntagbauer2018-10-167-19/+17
* | | Merge branch 'fix-review-link-docs' into 'master'Douwe Maan2018-10-161-1/+1
|\ \ \
| * | | Fix "ready for review" linkJan Provaznik2018-10-161-1/+1
* | | | Merge branch 'sh-fix-commit-signatures-error' into 'master'Douwe Maan2018-10-163-2/+24
|\ \ \ \
| * | | | Fix commit signature error when project is disabledStan Hu2018-10-153-2/+24
* | | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ...Douwe Maan2018-10-166-55/+115
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Web hook -> webhookSean McGivern2018-10-161-3/+3
| * | | | Fix image webhook rewriting for uploadsSean McGivern2018-10-166-53/+113
* | | | | Merge branch 'prettify-all-the-things-6' into 'master'Fatih Acet2018-10-1649-1443/+1458
|\ \ \ \ \
| * | | | | Prettify vue_shared modulesMike Greiling2018-10-1028-925/+914
| * | | | | Prettify vue_merge_request_widget modulesMike Greiling2018-10-1022-520/+550
* | | | | | Merge branch '52147-loading-state' into 'master'Mike Greiling2018-10-164-11/+16
|\ \ \ \ \ \
| * | | | | | Adds a `js-` class to allow for specsFilipa Lacerda2018-10-112-6/+7
| * | | | | | Fixes styling issues in test reportsFilipa Lacerda2018-10-113-5/+9
* | | | | | | Merge branch '52686-project-slug-does-not-auto-populate-in-ie11' into 'master'Mike Greiling2018-10-162-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Use literal instead of constructor for creating regexMartin Wortschack2018-10-152-4/+6
* | | | | | | | Merge branch 'test-usage-ping-in-timeout-case' into 'master'Robert Speicher2018-10-161-0/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Verify that usage ping works when all counts time outSean McGivern2018-10-161-0/+7
* | | | | | | | Merge branch 'qa-handle-sign-up-with-terms' into 'master'Nick Thomas2018-10-162-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | [QA] Handle sign-up when terms must be acceptedRémy Coutable2018-10-152-1/+4
* | | | | | | | | Merge branch '52477-add-iid-headers-to-emails' into 'master'Sean McGivern2018-10-163-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add IID headers to E-Mail notificationsLukas Eipert2018-10-163-0/+23
* | | | | | | | | | Merge branch 'ide-file-templates-clear' into 'master'Filipa Lacerda2018-10-163-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed file templates not clearing in Web IDEPhil Hughes2018-10-153-0/+14
* | | | | | | | | | | Merge branch 'docs-detectable-override' into 'master'Marcia Ramos2018-10-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Document linguist overridingZeger-Jan van de Weg2018-10-161-1/+5
* | | | | | | | | | | | Merge branch 'diff-stats-perf-bar' into 'master'Filipa Lacerda2018-10-162-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes diff stats not being visible with performance barPhil Hughes2018-10-162-0/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'mc/fix-artifact-before-validation' into 'master'Kamil Trzciński2018-10-162-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \