summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
* | | | Merge branch 'bvl-add-username-to-terms-message' into 'master'Douwe Maan2018-05-281-4/+4
|\ \ \ \
| * | | | Add username to terms message in git and API callsbvl-add-username-to-terms-messageBob Van Landuyt2018-05-241-4/+4
| | |_|/ | |/| |
* | | | Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-281-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+7
| |/ /
* | | Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-241-1/+1
|/ /
* | Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributesRémy Coutable2018-05-231-26/+18
* | Merge branch 'issue-25256' into 'master'Douwe Maan2018-05-233-5/+12
|\ \
| * | skip email trim when email is creating new issueCameron Crockett2018-05-223-5/+12
* | | Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \
| * | | Make Repo#squash_in_progress Opt-Outgitaly-repo-squash-in-progress-opt-outKim Carlbäcker2018-05-221-1/+1
* | | | Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \
| * | | | Move Wiki::GetFormattedData to OptOutgitaly-wiki-get-formatted-data-opt-outKim Carlbäcker2018-05-221-1/+1
| |/ / /
* | | | Merge branch 'gitaly-import-project-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \
| * | | | Move ImportProject to OptOut in Gitalygitaly-import-project-opt-outKim Carlbäcker2018-05-221-1/+1
| |/ / /
* | | | Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master'Douwe Maan2018-05-231-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Move Repository#info_attributes to OptOut in gitalygitaly-repo-info-attributes-opt-outKim Carlbäcker2018-05-221-1/+1
| |/ /