summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Minor refactoring simplification of Project#auto_devops_enabled?50193-minor-refactor-auto-devops-enabled-logicDylan Griffith2018-08-101-5/+2
* Merge branch 'patch-15' into 'master'Rémy Coutable2018-08-101-1/+0
|\
| * docs: removed duplicate `git_ssh_url` field from build event exampleAndreas Rammhold2018-08-091-1/+0
* | Merge branch 'frozen-string-enable-app-models-even-more-still' into 'master'Rémy Coutable2018-08-1056-14/+127
|\ \
| * | Enable frozen string in rest of app/models/**/*.rbgfyoung2018-08-1056-14/+127
* | | Merge branch 'rails5-fix-duplicate-gpg-signature' into 'master'Rémy Coutable2018-08-106-5/+10
|\ \ \ | |/ / |/| |
| * | Rails5 fix specs duplicate key value violates unique constraint 'index_gpg_si...Jasper Maes2018-08-096-5/+10
* | | Merge branch 'rs-update-debug-gems' into 'master'Stan Hu2018-08-091-9/+7
|\ \ \ | |_|/ |/| |
| * | Bump pry to 0.11.3; pry-byebug to 3.4.3Robert Speicher2018-08-091-9/+7
* | | Merge branch 'sh-add-seed-fixtures-for-spam-logs' into 'master'Robert Speicher2018-08-091-0/+32
|\ \ \
| * | | Add mock data for spam logsStan Hu2018-08-091-0/+32
* | | | Merge branch 'update-gitlab-shell-version' into 'master'Stan Hu2018-08-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update GitLab Shell to v8.1.1 to fix regressionsNick Thomas2018-08-091-1/+1
|/ / /
* | | Merge branch 'bvl-disable-prep-danger' into 'master'Rémy Coutable2018-08-091-0/+1
|\ \ \
| * | | Disable danger in preparation branchesBob Van Landuyt2018-08-091-0/+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
|\ \ \ \ \