summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.0.0-rc7v11.0.0-rc711-0-stable-prepare-rc8Alessio Caiazza2018-06-081-1/+1
* Merge branch '11-0-stable-prepare-rc7' into '11-0-stable'Mayra Cabrera2018-06-08294-2126/+3527
|\
| * Merge branch 'revert-rename-allow_collaboration-column' into 'master'Yorick Peterse2018-06-087-8/+56
| * Merge branch '2018-06-07-code-freeze' into 11-0-stable-prepare-rc7Filipa Lacerda2018-06-08289-2118/+3471
| |\ |/ /
| * Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ...2018-06-07-code-freeze-ee2018-06-07-code-freezeTim Zallmann2018-06-0817-1072/+308
| |\
| | * fix eslint violationMike Greiling2018-06-081-4/+4
| | * approve @webassemblyjs packages (MIT license)Mike Greiling2018-06-081-0/+6
| | * refactor monaco-editor import and stop storing as class property within modelMike Greiling2018-06-081-8/+7
| | * refactor monaco-editor import and stop storing as class property within editorMike Greiling2018-06-082-17/+16
| | * don't reference monaco directly in RepoEditor componentMike Greiling2018-06-071-4/+4
| | * remove need to pass monaco around through DIMike Greiling2018-06-077-15/+12
| | * remove monacoLoader and import monaco directly within Editor classMike Greiling2018-06-0711-106/+42
| | * remove copy-webpack-pluginMike Greiling2018-06-072-40/+2
| | * fix bug in call to monaco.Uri. first param is checked with `typeof param ===...Mike Greiling2018-06-071-3/+3
| | * add monaco-editor-webpack-plugin and update webpack configMike Greiling2018-06-074-39/+12
| | * update webpack and webpack-cli to latestMike Greiling2018-06-072-853/+217
| | * update monaco-editor dependencyMike Greiling2018-06-072-4/+4
| * | Merge branch 'set-tooltip-default-boundary' into 'master'Mike Greiling2018-06-083-2/+8
| |\ \
| | * | Set tooltips to have default boundary viewportClement Ho2018-06-083-2/+8
| |/ /
| * | Merge branch 'fix-ci-runner-token-hidden' into 'master'Annabel Gray2018-06-081-1/+1
| |\ \
| | * | Fix revealing a CI runner token doesn't actually reveal itClement Ho2018-06-071-1/+1
| * | | Merge branch 'fix-loading-icon' into 'master'Annabel Gray2018-06-081-1/+1
| |\ \ \
| | * | | Fix loading icon in activity viewfix-loading-iconClement Ho2018-06-071-1/+1
| | |/ /
| * | | Merge branch 'fix-markdown-code-mr-discussion' into 'master'Annabel Gray2018-06-081-1/+1
| |\ \ \
| | * | | Fix markdown code highlighting in mr discussionClement Ho2018-06-071-1/+1
| | |/ /
| * | | Merge branch 'fix-tasks-completed' into 'master'Annabel Gray2018-06-081-1/+1
| |\ \ \
| | * | | Fix tasks completed headerClement Ho2018-06-071-1/+1
| | |/ /
| * | | Merge branch 'workhorse-4-3-1' into 'master'Stan Hu2018-06-081-1/+1
| |\ \ \
| | * | | Update to GitLab Workhorse v4.3.1Nick Thomas2018-06-071-1/+1
| * | | | Merge branch 'fix-card-header-titles' into 'master'Annabel Gray2018-06-082-2/+9
| |\ \ \ \
| | * | | | Fix card title h3 headersClement Ho2018-06-082-2/+9
| |/ / / /
| * | | | Merge branch 'jl-update-error-rate-to-percent' into 'master'Mike Greiling2018-06-072-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Update docsJoshua Lambert2018-06-071-1/+1
| | * | | Update NGINX error rate to a percentageJoshua Lambert2018-06-061-4/+4
| * | | | Merge branch 'ce-5784-user-board-lists' into 'master'Sean McGivern2018-06-0733-118/+273
| |\ \ \ \
| | * | | | Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-0733-118/+273
| |/ / / /
| * | | | Merge branch 'mk/avoid-credential-leak-qa' into 'master'Robert Speicher2018-06-073-12/+49
| |\ \ \ \
| | * | | | QA: Redact credentials from URI in git outputMichael Kozono2018-06-073-12/+49
| |/ / / /
| * | | | Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'Clement Ho2018-06-074-20/+25
| |\ \ \ \
| | * | | | Use the default strings of timeago.js for timeagoTakuya Noguchi2018-06-044-20/+25
| * | | | | Merge branch 'jivl-ce-backport-card-class-integration-forms' into 'master'Clement Ho2018-06-073-5/+9
| |\ \ \ \ \
| | * | | | | CE backport for the card class changesJose Ivan Vargas2018-06-073-5/+9
| |/ / / / /
| * | | | | Merge branch '47358-labels' into 'master'Clement Ho2018-06-071-1/+1
| |\ \ \ \ \
| | * | | | | Resolve "Labels were bold in 10.8 but not with bootstrap4"Annabel Gray2018-06-071-1/+1
| |/ / / / /
| * | | | | Merge branch 'override-bootstrap4-font-hierarchy' into 'master'Annabel Gray2018-06-071-0/+2
| |\ \ \ \ \
| | * | | | | Override default font family hierarchy of bootstrap 4Clement Ho2018-06-071-0/+2
| |/ / / / /
| * | | | | Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon2018-06-075-23/+36
| |\ \ \ \ \
| | * | | | | Force Postgres to avoid trigram indexes when in a groupSean McGivern2018-06-073-5/+35
| | * | | | | Simplify issuable finder queriesSean McGivern2018-06-064-18/+1
| * | | | | | Merge branch 'issue_44230' into 'master'Sean McGivern2018-06-077-33/+286
| |\ \ \ \ \ \