summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Better namingan/no-healthcheck-until-brooklynAndrew Newdigate2018-07-121-2/+2
* Fixed testsAndrew Newdigate2018-07-121-44/+5
* Add changelogAndrew Newdigate2018-07-111-0/+5
* Removed healthchecks from prometheus endpointAndrew Newdigate2018-07-111-20/+1
* Merge branch 'fix-no-method-error-on-nil' into 'master'Kamil Trzciński2018-07-112-1/+21
|\
| * Fix an exception seen using the online terminalNick Thomas2018-07-112-1/+21
* | Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-1114-92/+378
|\ \
| * | Adds specs for toggleFileDiscussions actionFilipa Lacerda2018-07-112-3/+45
| * | Adds specs for getters in merge request vuex diff moduleFilipa Lacerda2018-07-113-95/+30
| * | Merge branch 'master' into 48237-toggle-file-commentsFilipa Lacerda2018-07-10319-1960/+2700
| |\ \
| * | | Fixes toggle discussion button not expanding collapsed discussionsFilipa Lacerda2018-07-107-6/+94
| * | | Removes hardcoded and unused propFilipa Lacerda2018-07-091-4/+0
* | | | Merge branch 'milestone-tests' into 'master'Rémy Coutable2018-07-1116-18/+151
|\ \ \ \
| * | | | Milestone testsDan Davison2018-07-1116-18/+151
|/ / / /
* | | | Fix long changelog file nameSean McGivern2018-07-111-0/+0
* | | | Merge branch '42751-rename-master-to-maintainer-2' into 'master'Dmitriy Zaporozhets2018-07-11495-1596/+1631
|\ \ \ \
| * | | | Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-11495-1596/+1631
|/ / / /
* | | | Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' int...Douwe Maan2018-07-112-2/+11
|\ \ \ \
| * | | | Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menuGabriel Mazetto2018-07-112-2/+11
* | | | | Merge branch '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in...Douwe Maan2018-07-113-8/+42
|\ \ \ \ \
| * | | | | Fix ProcessCommitWorker when upstream project is deletedSean McGivern2018-07-103-8/+42
* | | | | | Merge branch 'sh-bump-gitlab-shell' into 'master'Douwe Maan2018-07-111-1/+1
|\ \ \ \ \ \
| * | | | | | Bump gitlab-shell to 7.1.5Stan Hu2018-07-101-1/+1
* | | | | | | Merge branch 'make-sure-env-name-not-ending-in-slash' into 'master'Nick Thomas2018-07-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Make sure we're matching the same way.Lin Jen-Shin2018-07-101-2/+2
* | | | | | | | Merge branch 'gitaly-0.112.0' into 'master'Sean McGivern2018-07-111-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use gitaly 0.112.0Jacob Vosmaer2018-07-111-1/+1
* | | | | | | | | Merge branch 'add-back-mr-diff-deletion-migration' into 'master'Yorick Peterse2018-07-116-54/+224
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use schedulers and delete diff files upon deadtuples checkOswaldo Ferreira2018-07-106-76/+119
| * | | | | | | | | Remove unnecessary EachBatchOswaldo Ferreira2018-07-101-4/+0
| * | | | | | | | | Reschedule DeleteDiffFiles until there is none left to removeOswaldo Ferreira2018-07-103-33/+67
| * | | | | | | | | Wait postgresql vacuum of deadtuples on merge_request_diff_files deletionOswaldo Ferreira2018-07-106-180/+87
| * | | | | | | | | Add 1000 files per minute deletion ratio on schedulerOswaldo Ferreira2018-07-106-100/+112
| * | | | | | | | | Create a diff deletion worker scheduler to avoid long-running post-migrationOswaldo Ferreira2018-07-104-43/+94
| * | | | | | | | | Schedule batches in bulks of 5 diffsOswaldo Ferreira2018-07-102-17/+26
| * | | | | | | | | Revert "Temporarily remove MR diffs removal migration"Sean McGivern2018-07-103-1/+119
* | | | | | | | | | Merge branch 'gitaly-mandatory-20180711-jv' into 'master'Sean McGivern2018-07-114-223/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove last flags from Blob and WorkhorseJacob Vosmaer2018-07-114-223/+96
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs/cluster-permissions' into 'master'Marcia Ramos2018-07-111-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Mention admin privileges for k8s token creationAchilleas Pipinellis2018-07-101-2/+3
* | | | | | | | | | Merge branch 'jl-fix-object-storage-support-docs' into 'master'Marcia Ramos2018-07-111-7/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix object storage support notesJoshua Lambert2018-07-111-7/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'feature/add-docs-verbose-logging' into 'master'Rémy Coutable2018-07-111-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add documenation about how to active debug logging for gitlab-pagesDennis Günnewig2018-07-101-0/+18
* | | | | | | | | | | Merge branch '46519-remove-ce-prefix-suffix-in-check-ce' into 'master'bjk/health_helpRémy Coutable2018-07-111-8/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Find the EE branch by searching the branchesLin Jen-Shin2018-07-111-8/+20
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'runners-max-timeout-param' into 'master'Rémy Coutable2018-07-113-1/+69
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing maximum_timeout parametergfyoung2018-07-113-1/+69
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'rails5-autoload' into 'master'Sean McGivern2018-07-111-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [Rails5] Permit concurrent loadsJan Provaznik2018-07-101-1/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |