summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-no-method-error-on-nil' into 'master'Kamil Trzciński2018-07-111-1/+6
|\
| * Fix an exception seen using the online terminalNick Thomas2018-07-111-1/+6
* | Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-115-16/+18
* | Merge branch 'add-back-mr-diff-deletion-migration' into 'master'Yorick Peterse2018-07-112-25/+105
|\ \
| * | Use schedulers and delete diff files upon deadtuples checkOswaldo Ferreira2018-07-102-32/+60
| * | Remove unnecessary EachBatchOswaldo Ferreira2018-07-101-4/+0
| * | Reschedule DeleteDiffFiles until there is none left to removeOswaldo Ferreira2018-07-101-27/+36
| * | Wait postgresql vacuum of deadtuples on merge_request_diff_files deletionOswaldo Ferreira2018-07-102-86/+58
| * | Add 1000 files per minute deletion ratio on schedulerOswaldo Ferreira2018-07-102-15/+58
| * | Create a diff deletion worker scheduler to avoid long-running post-migrationOswaldo Ferreira2018-07-101-0/+32
* | | Remove last flags from Blob and WorkhorseJacob Vosmaer2018-07-112-104/+9
* | | 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
* | | | Add missing maximum_timeout parametergfyoung2018-07-111-1/+1
* | | | Merge branch 'rails5-autoload' into 'master'Sean McGivern2018-07-111-1/+11
|\ \ \ \
| * | | | [Rails5] Permit concurrent loadsJan Provaznik2018-07-101-1/+11
| | |/ / | |/| |
* | | | Merge branch 'sh-handle-colons-in-url-passwords' into 'master'James Lopez2018-07-111-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Properly handle colons in URL passwordsStan Hu2018-07-101-1/+1
| | |/ | |/|
* | | Remove timestamps from `locale/gitlab.pot`Bob Van Landuyt2018-07-101-1/+7
* | | Merge branch 'fix-conflicts-exception-for-submodules' into 'master'Rémy Coutable2018-07-101-4/+6
|\ \ \
| * | | Make sure ConflictsService does not raise for conflicting submodulesSean McGivern2018-07-101-4/+6
| | |/ | |/|
* | | Merge branch 'rd-6804-bug-unable-to-delete-branches-when-repo-reaches-the-siz...Robert Speicher2018-07-101-7/+13
|\ \ \
| * | | Backport some changes from EERubén Dávila2018-07-091-7/+13
| | |/ | |/|
* | | Merge branch '49057-fix-repository-typo' into 'master'Rémy Coutable2018-07-101-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix a typo? gitaly_operation{-s-}_clientLin Jen-Shin2018-07-101-1/+1
* | | Merge branch 'gitaly-mandatory-20180709-jv' into 'master'Douwe Maan2018-07-102-53/+7
|\ \ \
| * | | Use Gitaly for fetches and creating bundlesJacob Vosmaer2018-07-092-53/+7
* | | | Merge branch 'improve-metadata-access-performance' into 'master'Grzegorz Bizon2018-07-103-201/+208
|\ \ \ \ | |_|/ / |/| | |
| * | | Access metadata directly from Object StorageKamil Trzciński2018-07-093-201/+208
* | | | Merge branch '48537-update-avatar-only-via-api' into 'master'Rémy Coutable2018-07-101-1/+2
|\ \ \ \
| * | | | Fix #48537 - Update avatar only via the projects APIJamie Schembri2018-07-091-1/+2
| | |_|/ | |/| |
* | | | Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master'Douwe Maan2018-07-101-1/+2
|\ \ \ \
| * | | | Adds with_projects optional parameter to /groups/:id API endpointTiago Botelho2018-07-091-1/+2
* | | | | Support manually stopping any environment from the UIWinnie Hellmann2018-07-101-1/+2
| |/ / / |/| | |
* | | | Merge branch 'update-rubocop'Sean McGivern2018-07-0952-176/+153
|\ \ \ \
| * | | | Remove useless returnLin Jen-Shin2018-07-091-1/+1
| * | | | Resolve Naming/UncommunicativeMethodLin Jen-Shin2018-07-0918-132/+132
| * | | | Use stable gitlab-styles and eliminate offensesLin Jen-Shin2018-07-092-2/+1
| * | | | Updates from `rubocop -a`Lin Jen-Shin2018-07-0934-42/+20
| | |/ / | |/| |
* | | | Merge branch 'gitaly-update-branch' into 'master'Robert Speicher2018-07-092-1/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Use Gitaly's OperationService.UserUpdateBranch RPCAlejandro Rodríguez2018-07-082-1/+23
* | | | Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-092-3/+4
|\ \ \ \
| * | | | Added test and used Array() instead of .wrapJan Provaznik2018-07-091-1/+1
| * | | | Add FileUploader.root to allowed upload pathsJan Provaznik2018-07-082-3/+4
| |/ / /
* | | | Merge branch 'sh-fix-issue-47797-ce' into 'master'Douwe Maan2018-07-091-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix handling of annotated tags when Gitaly is not in useStan Hu2018-07-091-0/+5
| |/ /
* | | Merge branch '48976-rails5-invalid-single-table-inheritance-type-group-is-not...Yorick Peterse2018-07-091-0/+2
|\ \ \
| * | | [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass ...blackst0ne2018-07-071-0/+2
* | | | Merge branch 'bvl-gettext-updated-check-fix-ce' into 'master'Sean McGivern2018-07-091-7/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update `gettext:updated_check` regenerate pot fileBob Van Landuyt2018-07-091-7/+23
| | |/ | |/|