summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clarify RC exception rulemk/rc-exception-clarificationMichael Kozono2018-06-081-1/+1
* Merge branch 'rs-schema-spec-parity' into 'master'Nick Thomas2018-06-081-1/+5
|\
| * Refactor schema_spec.rb for CE-EE parity and simplicityRobert Speicher2018-06-071-1/+5
* | Merge branch '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devo...Achilleas Pipinellis2018-06-081-3/+27
|\ \
| * | Copyedit Auto DevOps deployment strategy docsAchilleas Pipinellis2018-06-081-11/+22
| * | Add brief technical explanation for deploy strategies variablesMatija Čupić2018-06-081-0/+2
| * | Link option descriptionsMatija Čupić2018-06-071-2/+2
| * | Add option descriptionsMatija Čupić2018-06-071-0/+2
| * | Add deployment strategy docsMatija Čupić2018-06-071-0/+9
* | | Merge branch '47519-discussion-padding' into 'master'Clement Ho2018-06-081-4/+0
|\ \ \
| * | | Remove padding on .codeAnnabel Dunstone Gray2018-06-071-4/+0
* | | | Merge branch 'update-11-0-templates' into 'master'Mayra Cabrera2018-06-0810-240/+31
|\ \ \ \
| * | | | Updates templates for 11.0Filipa Lacerda2018-06-0810-240/+31
* | | | | Merge branch 'rails5-fix-47370' into 'master'Douwe Maan2018-06-083-114/+128
|\ \ \ \ \
| * | | | | Use same gem versions for rails5 as for rails4 where possibleJasper Maes2018-06-073-114/+128
* | | | | | Merge branch 'remove-settings-title-suffix' into 'master'Clement Ho2018-06-088-31/+144
|\ \ \ \ \ \
| * | | | | | Update settings section titlesAndreas Kämmerle2018-06-088-31/+144
|/ / / / / /
* | | | | | Merge branch 'update-licenses-11-0' into 'master'Mayra Cabrera2018-06-081-267/+122
|\ \ \ \ \ \
| * | | | | | Update the dependencies license listAlessio Caiazza2018-06-081-267/+122
* | | | | | | Merge branch 'revert-rename-allow_collaboration-column' into 'master'Yorick Peterse2018-06-087-8/+56
|\ \ \ \ \ \ \
| * | | | | | | Revert rename allow collaboration columnMark Chao2018-06-087-8/+56
|/ / / / / / /
* | | | | | | Merge branch '45400-automatically-created-mr-uses-wrong-target-branch-when-br...Sean McGivern2018-06-083-4/+16
|\ \ \ \ \ \ \
| * | | | | | | Resolve "Automatically created MR uses wrong target branch (when branching fr...Athar Hameed2018-06-083-4/+16
|/ / / / / / /
* | | | | | | Merge branch 'use-restore-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-084-31/+63
|\ \ \ \ \ \ \
| * | | | | | | 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 EESean McGivern2018-06-081-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-reque...Douwe Maan2018-06-081-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | 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/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