summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'code-freeze-20181207' into 11-6-stable-prepare-rc5Alex Hanselka2018-12-1022-55/+618
|\
| * Merge branch 'tc-backfill-hashed-project_repositories' into 'master'Stan Hu2018-12-071-0/+134
| |\
| | * Fill project_repositories for hashed storageDouglas Barbosa Alexandre2018-12-061-41/+51
| | * Fill project_repositories for hashed storageToon Claes2018-12-061-0/+124
| * | Changed frontmatter filtering to support YAML, JSON, TOML, and arbitrary lang...Travis Miller2018-12-073-28/+35
| * | Merge branch 'ce-issue_5603' into 'master'Dmitriy Zaporozhets2018-12-071-16/+50
| |\ \
| | * | [CE] - Add milestones autocomplete for epicsFelipe Artur2018-12-071-16/+50
| * | | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-073-0/+114
| |/ /
| * | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-0710-9/+134
| |\ \
| | * | Add `::` to Gitlab::Middleware::CorrelationIdKamil Trzciński2018-12-071-1/+1
| | * | Revert "Prefer to use correlation-id in logs"Kamil Trzciński2018-12-063-3/+3
| | * | Prefer to use correlation-id in logsKamil Trzciński2018-12-063-3/+3
| | * | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-0610-9/+134
| * | | Merge branch '48889-populate-merge_commit_sha' into 'master'Douwe Maan2018-12-071-0/+132
| |\ \ \
| | * | | Fix commit with two parents is set with wrong direct_ancestorMark Chao2018-12-071-11/+22
| | * | | Update merge request's merge_commit for branch updateMark Chao2018-12-071-0/+121
| * | | | Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' int...Douwe Maan2018-12-072-2/+18
| |\ \ \ \
| | * | | | Backports some changes from gitlab-ee!7885Rubén Dávila2018-12-072-2/+18
| | |/ / /
| * | | | Encrypt CI/CD builds tokensKamil Trzciński2018-12-071-0/+1
| |/ / /
* | | | Merge branch 'master' into 11-6-stableAlex Hanselka2018-12-061-1/+0
|\ \ \ \ | |/ / /
| * | | Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"Robert Speicher2018-12-061-1/+0
| | |/ | |/|
* | | Merge branch 'master' into 11-6-stable-prepare-rc4Alex Hanselka2018-12-0678-772/+1800
|\ \ \ | |/ /
| * | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-061-0/+1
| * | Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre2018-12-063-0/+65
| |\ \
| | * | Use BFG object maps to clean projectsNick Thomas2018-12-063-0/+65
| * | | Merge branch '54975-fix-web-hooks-rake-task' into 'master'Stan Hu2018-12-061-13/+32
| |\ \ \
| | * | | Fix gitlab:web_hook tasksNick Thomas2018-12-061-13/+32
| | |/ /
| * | | Merge branch '54857-fix-templates-path-traversal' into 'master'Cindy Pallares2018-12-064-1/+19
| |\ \ \ | | |/ / | |/| |
| | * | Prevent a path traversal attack on global file templatesNick Thomas2018-12-054-1/+19
| * | | Merge branch 'blob-count2' into 'master'Rémy Coutable2018-12-067-121/+196
| |\ \ \
| | * | | Optimized file search to work without limitsJan Provaznik2018-12-067-121/+196
| * | | | Use approximate counts for big tablesJan Provaznik2018-12-063-6/+16
| * | | | Merge branch 'sh-handle-invalid-gpg-sig' into 'master'Nick Thomas2018-12-061-7/+17
| |\ \ \ \
| | * | | | Gracefully handle unknown/invalid GPG keysStan Hu2018-12-051-7/+17
| | | |_|/ | | |/| |
| * | | | Merge branch '52285-omniauth-jwt-provider-dont-support-rsa-ecdsa-and-other-pp...Douwe Maan2018-12-061-2/+15
| |\ \ \ \
| | * | | | Support RSA and ECDSA algorithms in Omniauth JWTMichael Tsyganov2018-12-051-2/+15
| | |/ / /
| * | | | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-061-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Exclude encrypted build token from import/export and retriesGrzegorz Bizon2018-12-051-0/+1
| * | | | Merge branch '54886-usage-data-group-clusters' into 'master'Kamil Trzciński2018-12-051-0/+4
| |\ \ \ \
| | * | | | Add UsageData for group/project clustersDylan Griffith2018-12-051-0/+4
| * | | | | Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński2018-12-051-6/+23
| |\ \ \ \ \
| | * | | | | Various improvements to hierarchy sortingThong Kuah2018-12-051-12/+14
| | * | | | | Deploy to clusters for a project's groupsThong Kuah2018-12-051-4/+19
| | * | | | | Modify service so that it can be re-runThong Kuah2018-12-051-0/+57
| * | | | | | Rename project's pipelines relationFrancisco Javier López2018-12-0511-10/+63
| * | | | | | Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas2018-12-052-0/+14
| |\ \ \ \ \ \
| | * | | | | | Avoid 500's when serializing legacy diff notesosw-fix-grouping-by-file-pathOswaldo Ferreira2018-12-042-0/+14
| * | | | | | | Merge branch 'mk/refactor-gitlab-check-rake-tasks-ce' into 'master'Nick Thomas2018-12-0518-247/+487
| |\ \ \ \ \ \ \
| | * | | | | | | Extract system check rake task logicMichael Kozono2018-12-0318-247/+487
| * | | | | | | | Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' i...Grzegorz Bizon2018-12-051-0/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
View Lorry Controller Status