summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunkOswaldo Ferreira2018-06-052-3/+10
* Backport EE SlashCommand RefactorMark Chao2018-06-041-8/+10
* Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse2018-06-041-2/+7
|\
| * Rails5 Fix arel fromJasper Maes2018-06-021-2/+7
* | Add ability to search wiki titlesFrancisco Javier López2018-06-043-8/+44
* | Reveert build_relations and simply add a line for creating iidShinya Maeda2018-06-021-13/+7
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0211-28/+132
|\ \ | |/
| * Make http_io honor HTTP(S)_PROXY environment.NLR2018-06-011-1/+1
| * Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-018-22/+100
| * Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-011-0/+19
| |\
| | * Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-011-2/+17
| | * Eliminate constants warnings by:Lin Jen-Shin2018-06-011-0/+4
| * | Add validation to webhook and service URLs to ensure they are not blocked bec...Francisco Javier López2018-06-011-5/+12
| |/
* | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0114-18/+116
|\ \ | |/
| * Merge branch 'rails5-active-sup-subscriber' into 'master'Rémy Coutable2018-05-311-1/+1
| |\
| | * Make ActiveRecordSubscriber rails 5 compatibleJarka Kadlecová2018-05-311-1/+1
| * | Merge branch '41587-osw-mr-metrics-migration-take-two' into 'master'Grzegorz Bizon2018-05-312-2/+13
| |\ \
| | * | Take two for MR metrics population background migrationOswaldo Ferreira2018-05-302-2/+13
| * | | Export assigned issues in iCalendar feedImre Farkas2018-05-312-5/+15
| * | | Merge branch 'rails5-calendar' into 'master'Yorick Peterse2018-05-311-1/+1
| |\ \ \
| | * | | Replace .having with .where in calendar queryJan Provaznik2018-05-301-1/+1
| * | | | Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'Douwe Maan2018-05-311-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix encoding error in Gitaly::Commit::TreeEntryKim "BKC" Carlbäcker2018-05-301-1/+1
| | | |/ | | |/|
| * | | Merge branch 'fj-36819-remove-v3-api' into 'master'Douwe Maan2018-05-313-7/+7
| |\ \ \
| | * | | Removed API endpoint and specsfj-36819-remove-v3-apiFrancisco Javier López2018-05-303-7/+7
| | |/ /
| * | | Merge branch 'dm-relative-url-root-in-development' into 'master'Rémy Coutable2018-05-312-1/+6
| |\ \ \ | | |/ / | |/| |
| | * | Fix various bugs related to relative_url_root in developmentDouwe Maan2018-05-292-1/+6
| * | | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-301-0/+71
| |\ \ \
| | * | | refactor to remove duplicationGabriel Mazetto2018-05-281-14/+12
| | * | | Refactor RakeHelper to reduce complexityGabriel Mazetto2018-05-281-26/+18
| | * | | Extracted auxiliary methods from storage.rake into specific RakeHelperGabriel Mazetto2018-05-281-0/+81
| * | | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-301-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-241-0/+1
* | | | | Add build_relations method in Chain::PopulateShinya Maeda2018-05-302-7/+13
* | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-3015-37/+208
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-291-2/+2
| |\ \ \ \
| | * | | | Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
| | |/ / /
| * | | | Merge remote-tracking branch 'dev/master'Mayra Cabrera2018-05-296-14/+38
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'security-fj-import-export-assignment' into 'master'Mayra Cabrera2018-05-296-14/+38
| | |\ \ \
| | | * | | Blacklisting attributes in the project import processFrancisco Javier López2018-05-146-14/+38
| * | | | | Log queue duration for Grape API callssh-tag-queue-duration-api-callsStan Hu2018-05-281-0/+26
| | |_|_|/ | |/| | |
| * | | | Merge branch 'add-background-migration-to-fill-file-store' into 'master'Kamil Trzciński2018-05-283-0/+61
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove Gitlab::BackgroundMigration exxxplicit namespaces from migration classesShinya Maeda2018-05-283-6/+6
| | * | | Rename FillFileStoreUpload to FillStoreUploadShinya Maeda2018-05-281-2/+2
| | * | | Add spec for fill_file_store migrationShinya Maeda2018-05-283-6/+6
| | * | | Remove legacy artifacts file_store migrationShinya Maeda2018-05-282-42/+0
| | * | | Add background migration to fill file storesShinya Maeda2018-05-285-0/+103
| * | | | Merge branch 'sh-fix-admin-page-counts-take-2' into 'master'Yorick Peterse2018-05-281-17/+55
| |\ \ \ \
| | * | | | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-251-17/+55
| | |/ / /
| * | | | Use Gitaly's DeleteAllRepositories RPC during backup restoreJacob Vosmaer (GitLab)2018-05-281-0/+15