summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-fj-stored-xss-in-repository-imports-11-1' into 'securi...Bob Van Landuyt2018-09-251-1/+1
* Merge branch 'fix-events-finder-incomplete-11-1' into 'security-11-1'Bob Van Landuyt2018-09-251-3/+19
* Merge branch 'sh-sh-block-other-localhost-11-1' into 'security-11-1'Bob Van Landuyt2018-09-251-0/+7
* Merge branch 'security-security-2697-code-highlight-timeout-11-1' into 'secur...Diana Stanley2018-09-251-1/+13
* Merge branch 'security-diff-cache-fix-11-1' into 'security-11-1'José Iván Vargas López2018-08-281-3/+4
* Merge branch 'sh-block-link-local-master-11-1-port' into 'security-11-1'Nick Thomas2018-08-241-0/+8
* Merge branch 'security-2694-pipeline-11-1' into 'security-11-1'José Iván Vargas López2018-08-241-1/+1
* Merge branch 'security-49085-11.1-persistent-xss-rendering' into 'security-11-1'José Iván Vargas López2018-08-242-2/+2
* Merge branch 'security-mk-exclude-orphaned-upload-files-from-export-11-1' int...José Iván Vargas López2018-08-241-8/+11
* Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-272-4/+8
* Merge branch 'sh-revert-markdown-changes' into 'master'Robert Speicher2018-07-251-1/+1
* Merge branch 'security-event-counters-private-data-11-1' into 'security-11-1'Felipe Artur Cardozo2018-07-246-21/+3
* Merge branch '48745-project-exports-fail-when-uploads-have-been-migrated-to-o...Sean McGivern2018-07-234-18/+130
* Merge branch 'gitaly-ff-branch-nil' into 'master'Rémy Coutable2018-07-232-5/+8
* Merge branch 'jprovazn-fix-filename' into 'master'Kamil Trzciński2018-07-231-1/+11
* Merge branch 'sh-fix-issue-49133-11-1-stable' into 'security-11-1'Dmitriy Zaporozhets2018-07-171-1/+2
* Merge branch 'gitaly-serverservice-info-timeout' into 'master'11-1-stable-prepare-rc11Rémy Coutable2018-07-132-2/+2
* Merge branch 'fix-performance-problem-of-tags-query' into 'master'11-1-stable-prepare-rc10Yorick Peterse2018-07-121-4/+11
* Merge branch 'revert-todos-epic' into 'master'11-1-stable-prepare-rc8Yorick Peterse2018-07-111-9/+4
* Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7Rémy Coutable2018-07-111-4/+6
* Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-092-3/+4
* Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-091-1/+1
* Improve render performance of large wiki pagesPeter Leitzen2018-07-071-3/+8
* Merge branch '48670-application-settings-may-not-be-invalidated-if-migrations...Stan Hu2018-07-071-4/+0
|\
| * Stop relying on migrations in the CacheableAttributes cache key and cache att...Rémy Coutable2018-07-051-4/+0
* | Refactor rspec matchers in read_only_spec.rbBrett Walker2018-07-071-0/+1
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-065-15/+73
|\ \
| * | fix permissionsJames Lopez2018-07-061-1/+2
| * | Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-065-15/+72
* | | Ability to check if underlying database is read onlyBrett Walker2018-07-061-0/+15
* | | Merge branch 'gitaly-set-delete-config' into 'master'Nick Thomas2018-07-062-6/+55
|\ \ \
| * | | Add Repository#set_config and #delete_configJacob Vosmaer2018-07-062-6/+55
* | | | Merge branch 'build-chunks-on-object-storage' into 'master'Grzegorz Bizon2018-07-061-0/+29
|\ \ \ \
| * \ \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-0628-134/+210
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-047-310/+62
| |\ \ \ \ \
| * | | | | | Add spec for ExclusiveLeaseHelpersShinya Maeda2018-07-031-0/+29
* | | | | | | Merge branch 'gitaly-conflicts-find-commit' into 'master'Douwe Maan2018-07-062-77/+6
|\ \ \ \ \ \ \
| * | | | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-062-77/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-062-1/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | added API docsPhil Hughes2018-07-051-1/+1
| * | | | | | karma & rubocop fixesPhil Hughes2018-07-051-2/+2
| * | | | | | only include _html fields when asked forPhil Hughes2018-07-052-7/+8
| * | | | | | added html to responsePhil Hughes2018-07-051-0/+6
* | | | | | | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-061-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-021-0/+5
* | | | | | | Merge branch 'jprovazn-label-links-update' into 'master'Sean McGivern2018-07-061-0/+138
|\ \ \ \ \ \ \
| * | | | | | | Fixed pluck and renamed methodsJan Provaznik2018-07-051-7/+8
| * | | | | | | Restrict group scopeJan Provaznik2018-07-051-1/+1
| * | | | | | | Added tests for MRsJan Provaznik2018-07-051-1/+1
| * | | | | | | Fixed sql string splitsJan Provaznik2018-07-041-7/+6