summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Catch gitaly N+1 on noteosw-fix-gitaly-n-plus-one-on-note-creationOswaldo Ferreira2018-08-101-6/+1
* Merge branch 'fix-labels-list-item-height-with-no-description' into 'master'Fatih Acet2018-08-091-0/+5
|\
| * [ci-skip] add changelogLuke Bennett2018-08-091-0/+5
| * Consistent padding but correct label-actions-list positioning and label-links...Luke Bennett2018-08-091-2/+2
| * Fix label item height when no descLuke Bennett2018-08-091-1/+2
* | Merge branch '49375-move-reports-code' into 'master'Phil Hughes2018-08-0915-21/+19
|\ \
| * | Moves report components to reports folderFilipa Lacerda2018-08-0715-21/+19
* | | Merge branch 'feat/add-default-avatar-to-group' into 'master'Rémy Coutable2018-08-098-50/+99
|\ \ \
| * | | Add default avatar to groupGeorge Tsiolis2018-08-098-50/+99
|/ / /
* | | Merge branch 'ab-49789-fks-want-indexes' into 'master'Rémy Coutable2018-08-095-1/+133
|\ \ \
| * | | Add rubocop check for add_reference to require index.Andreas Brandl2018-08-084-1/+105
| * | | Docs: FK constraints require an index.Andreas Brandl2018-08-081-0/+28
* | | | Merge branch 'ide-open-empty-merge-request' into 'master'Filipa Lacerda2018-08-093-4/+10
|\ \ \ \
| * | | | removed un-used commits for currentProject & currentBranchIdPhil Hughes2018-08-092-4/+1
| * | | | Allow the Web IDE to open empty merge requestsPhil Hughes2018-08-092-1/+10
* | | | | Merge branch 'fix-labels-list-item-height-with-no-description' into 'master'Fatih Acet2018-08-091-1/+2
|\ \ \ \ \
| * | | | | Fix label item height when no descLuke Bennett2018-08-091-1/+2
|/ / / / /
* | | | | Merge branch '50153-fix-docs' into 'master'Rémy Coutable2018-08-091-22/+22
|\ \ \ \ \
| * | | | | Fix docs lintingRémy Coutable2018-08-091-22/+22
|/ / / / /
* | | | | Merge branch 'edstub207-#47282-phase2' into 'master'Dmitriy Zaporozhets2018-08-096-596/+995
|\ \ \ \ \
| * | | | | Phase 2: #47282 Improving Contributor On-Boarding DocumentationEddie Stubbington2018-08-096-596/+995
|/ / / / /
* | | | | Merge branch '49821-docs-update-api-for-usage-with-an-array-of-hashes' into '...Marcia Ramos2018-08-091-4/+17
|\ \ \ \ \
| * | | | | Resolve "docs update api for usage with an array of hashes"Alexander2018-08-091-4/+17
|/ / / / /
* | | | | Merge branch '7047-fix-user-creation-error-from-admin-ce' into 'master'Sean McGivern2018-08-091-1/+14
|\ \ \ \ \
| * | | | | Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...Jacopo2018-08-071-1/+14
* | | | | | Merge branch 'sh-bitbucket-importer-docs' into 'master'Achilleas Pipinellis2018-08-097-15/+89
|\ \ \ \ \ \
| * | | | | | Add introduced sectionAchilleas Pipinellis2018-08-091-0/+3
| * | | | | | Copyedit Bitbucket docsAchilleas Pipinellis2018-08-093-20/+15
| * | | | | | Add Bitbucket Server importer docsStan Hu2018-08-086-8/+84
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'thernstig-master-patch-09581' into 'master'Achilleas Pipinellis2018-08-091-2/+2
|\ \ \ \ \ \
| * | | | | | Update doc/integration/oauth_provider.mdTobias Hernstig2018-08-081-2/+2
| |/ / / / /
* | | | | | Merge branch 'docs-fix-conflict-bulk-editing' into 'master'Achilleas Pipinellis2018-08-092-7/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Docs: fix ee-conflict in bulk editingMarcia Ramos2018-08-092-7/+15
|/ / / / /
* | | | | Merge branch 'rd-fix-bug-when-authenticating-user-for-repo-with-size-check-en...Stan Hu2018-08-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Backport of gitlab-org/gitlab-ee!6848Rubén Dávila2018-08-081-1/+1
|/ / / /
* | | | Merge branch 'sh-fix-bitbucket-cloud-importer-replies' into 'master'Robert Speicher2018-08-083-10/+93
|\ \ \ \
| * | | | Fix Bitbucket Cloud importer omitting repliesStan Hu2018-08-073-10/+93
* | | | | Merge branch 'ci-builds-status-index' into 'master'Yorick Peterse2018-08-083-2/+23
|\ \ \ \ \
| * | | | | Remove redundant ci_builds (status) indexKamil Trzciński2018-08-073-2/+23
* | | | | | Merge branch 'frozen-string-enable-app-models-even-more' into 'master'Stan Hu2018-08-08101-2/+205
|\ \ \ \ \ \
| * | | | | | Enable more frozen string in app/models/**/*.rbgfyoung2018-08-07101-2/+205
* | | | | | | Merge branch '35952-keep-project-repository-settings-open-after-submit' into ...Tim Zallmann2018-08-0814-22/+24
|\ \ \ \ \ \ \
| * | | | | | | fix spec failuresMike Greiling2018-08-082-3/+3
| * | | | | | | ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-0812-19/+21
* | | | | | | | Merge branch '35952-keep-project-settings-open-after-submit' into 'master'Tim Zallmann2018-08-084-8/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Keep project settings sections expanded after submitting formMike Greiling2018-08-084-8/+12
|/ / / / / / / /
* | | | | | | | Merge branch '35952-keep-group-settings-open-after-submit' into 'master'Tim Zallmann2018-08-083-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | ensure all group settings panels remain open after form submissionMike Greiling2018-08-083-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'ee-6470-milestone-dates-integrated-into-epics' into 'master'Sean McGivern2018-08-084-2/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Port Milestone trait back used in EEMark Chao2018-08-071-0/+5