summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-084-31/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RestoreCustomHooks RPC in restore rake task See merge request gitlab-org/gitlab-ce!19370
| * | | | | | | | | | | | | | | | | | | RefactorAhmad Hassan2018-06-081-35/+32
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Use RestoreCustomHooks RPC in restore rake taskAhmad Hassan2018-06-074-13/+48
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-notification-recipient-service-spec-for-ee' into 'master'Douwe Maan2018-06-081-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NotificationRecipientService spec for EE See merge request gitlab-org/gitlab-ce!19580
| * | | | | | | | | | | | | | | | | | | Fix NotificationRecipientService spec for EESean McGivern2018-06-081-3/+3
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE checks a license, which needs RequestStore enabled to avoid N+1 queries. However, enabling RequestStore causes Gitaly to complain about N+1 invocations, which we really don't care about here.
* | | | | | | | | | | | | | | | | | | Merge branch ↵Douwe Maan2018-06-081-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '5974-geo-unauthenticated-rate-limits-should-not-block-geo-requests' into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5876/ Closes #5974 See merge request gitlab-org/gitlab-ce!19189
| * | | | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/58765974-geo-unauthenticated-rate-limits-should-not-block-geo-requestsValery Sizov2018-05-291-1/+5
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'lib-gitlab-git-version-popen' into 'master'Douwe Maan2018-06-082-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitlab::Popen dependency from lib/gitlab/git See merge request gitlab-org/gitlab-ce!19577
| * | | | | | | | | | | | | | | | | | | | 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 scenario Closes gitlab-qa#251 See merge request gitlab-org/gitlab-ce!19280
| * | | | | | | | | | | | | | | | | | | Automate the basic API tests in a QA scenarioRémy Coutable2018-06-061-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | | | | Improve the Runtime::API classesRémy Coutable2018-06-068-126/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | Merge branch 'ide-pipeline-panel-resizable' into 'master'Tim Zallmann2018-06-081-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow IDE pipeline panel to be resizable Closes #47538 See merge request gitlab-org/gitlab-ce!19558
| * | | | | | | | | | | | | | | | | | | Allow IDE pipeline panel to be resizablePhil Hughes2018-06-071-3/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47538
* | | | | | | | | | | | | | | | | | | Merge branch 'improve-housekeeping-spec' into 'master'Nick Thomas2018-06-081-31/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes for Housekeeping Specs See merge request gitlab-org/gitlab-ce!18595
| * | | | | | | | | | | | | | | | | | 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.md See merge request gitlab-org/gitlab-ce!19560
| * | | | | | | | | | | | | | | | | | | 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.md See merge request gitlab-org/gitlab-ce!19559
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin" Closes #44331 See merge request gitlab-org/gitlab-ce!17813
| * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === 'object'` which is true for `null` due to a JS quirk
| * | | | | | | | | | | | | | | | | | | 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 viewport Closes #47518 See merge request gitlab-org/gitlab-ce!19561
| * | | | | | | | | | | | | | | | | | | | 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 it Closes #47552 See merge request gitlab-org/gitlab-ce!19567
| * | | | | | | | | | | | | | | | | | | | 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 view Closes #47508 See merge request gitlab-org/gitlab-ce!19566
| * | | | | | | | | | | | | | | | | | | | 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 discussion Closes #47521 See merge request gitlab-org/gitlab-ce!19564
| * | | | | | | | | | | | | | | | | | | | 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 header Closes #47506 See merge request gitlab-org/gitlab-ce!19562
| * | | | | | | | | | | | | | | | | | | | 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.1 See merge request gitlab-org/gitlab-ce!19525
| * | | | | | | | | | | | | | | | | | | | 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 headers See merge request gitlab-org/gitlab-ce!19510
| * | | | | | | | | | | | | | | | | | | | | 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 NGINX error rate to a percentage See merge request gitlab-org/gitlab-ce!19471
| * | | | | | | | | | | | | | | | | | | | Update docsJoshua Lambert2018-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Update NGINX error rate to a percentageJoshua Lambert2018-06-061-4/+4
| | | | | | | | | | | | | | | | | | | | |