summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'fix-doc-on-migration' into 'master'Sean McGivern2018-07-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix doc for large table column renameMark Chao2018-07-111-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'sh-handle-colons-in-url-passwords' into 'master'James Lopez2018-07-113-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Properly handle colons in URL passwordsStan Hu2018-07-103-1/+7
* | | | | | | | Merge branch 'sh-fix-git-gc-error-handling' into 'master'Robert Speicher2018-07-102-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix ArgumentError in GitGarbageCollectWorker Sidekiq jobStan Hu2018-07-102-2/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'winh-speedup-smartinterval-tests' into 'master'48657-persist-auto-devops-banner-dismissal-per-user-cookieMike Greiling2018-07-103-99/+130
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Mock timeouts and Promise in SmartInterval testsWinnie Hellmann2018-07-103-99/+130
|/ / / / / / /
* | | | | | | Merge branch 'bvl-remove-pot-timestamps' into 'master'Rémy Coutable2018-07-102-3/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove timestamps from `locale/gitlab.pot`Bob Van Landuyt2018-07-102-3/+7
|/ / / / / /
* | | | | | Merge branch 'add-dst-support-to-pipeline-schedule' into 'master'Kamil Trzciński2018-07-102-1/+6
|\ \ \ \ \ \
| * | | | | | Add daylight saving time support for pipeline schedulesCollen2018-07-102-1/+6
|/ / / / / /
* | | | | | Merge branch 'fix-conflicts-exception-for-submodules' into 'master'Rémy Coutable2018-07-104-15/+31
|\ \ \ \ \ \
| * | | | | | Make sure ConflictsService does not raise for conflicting submodulesSean McGivern2018-07-104-15/+31
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-07-102-4/+4
|\ \ \ \ \ \
| * | | | | | Fix a typo on CI Runner page on ProjectsAve2018-07-102-4/+4
|/ / / / / /