summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add clarification of Prometheus Histograms.bjk/update_metrics_docsBen Kochie2018-06-081-0/+6
* Document new Prometheus metricsBen Kochie2018-06-081-22/+28
* Re-align table.Ben Kochie2018-06-081-22/+22
* Merge branch 'lib-gitlab-git-version-popen' into 'master'Douwe Maan2018-06-082-1/+12
|\
| * Remove Gitlab::Popen dependency from lib/gitlab/gitJacob Vosmaer2018-06-082-1/+12
* | Merge branch 'qa-251-api-tests' into 'master'Grzegorz Bizon2018-06-089-126/+193
|\ \
| * | Automate the basic API tests in a QA scenarioRémy Coutable2018-06-061-0/+61
| * | Improve the Runtime::API classesRémy Coutable2018-06-068-126/+132
* | | Merge branch 'ide-pipeline-panel-resizable' into 'master'Tim Zallmann2018-06-081-3/+9
|\ \ \ | |_|/ |/| |
| * | Allow IDE pipeline panel to be resizablePhil Hughes2018-06-071-3/+9
* | | Merge branch 'improve-housekeeping-spec' into 'master'Nick Thomas2018-06-081-31/+41
|\ \ \
| * | | backport changes from gitlab-org/gitlab-ee!5461improve-housekeeping-specGabriel Mazetto2018-04-261-31/+41
* | | | Merge branch 'coached-20180607-2' into 'master'Tim Zallmann2018-06-081-12/+58
|\ \ \ \
| * | | | fixed typos, added text for clarifiction; markdown.mdEdwin Torres2018-06-071-12/+58
* | | | | Merge branch 'coached-20180607-1' into 'master'Phil Hughes2018-06-081-2/+2
|\ \ \ \ \
| * | | | | fixed broken links in index.mdEdwin Torres2018-06-071-2/+2
| | |_|/ / | |/| | |
* | | | | 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
|/ / / / / / / /