summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-092-5/+12
* Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-083-3/+19
* Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-071-0/+4
* Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-073-33/+84
* Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-071-1/+15
* Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-071-1/+1
* Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-074-10/+4
* Merge branch 'sh-handle-orphaned-deploy-keys' into 'master'Grzegorz Bizon2017-12-291-3/+6
* Merge branch 'gitaly-opt-out' into 'master'Stan Hu2017-12-291-2/+2
* Merge branch '10-3-stable' into '10-3-stable-patch-1'Oswaldo Ferreira2017-12-261-1/+1
|\
| * Use AtomicReference instead of AtomicFixnumMike Limansky2017-12-231-1/+1
* | Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'Grzegorz Bizon2017-12-261-0/+4
* | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-266-18/+23
* | Merge branch 'dm-issue-move-transaction-error' into 'master'Robert Speicher2017-12-261-1/+9
|/
* Merge branch 'zj-empty-repo-importer' into 'master'Stan Hu2017-12-211-1/+1
* Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-192-5/+17
* Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-193-22/+32
* Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-191-1/+16
* Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"Oswaldo Ferreira2017-12-132-17/+5
* Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-132-5/+17
* Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-132-35/+42
* Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-131-1/+3
* Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-132-51/+0
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-132-2/+17
* Merge branch 'bvl-circuitbreaker-metrics' into 'master'Douwe Maan2017-12-131-1/+23
* Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-136-62/+79
* Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-132-0/+3
* Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-134-14/+86
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0811-118/+396
* Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-082-2/+27
* Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-071-0/+3
|\
| * Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-071-0/+3
* | Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-071-1/+1
|\ \
| * | fix #39233 - 500 in merge requestMartin Nowak2017-12-071-1/+1
* | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-071-3/+3
|\ \ \
| * | | Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-071-3/+3
| |/ /
* | | Merge branch 'fix/push-read-only-message-ce' into 'master'Douwe Maan2017-12-072-2/+10
|\ \ \ | |_|/ |/| |
| * | refactor code to match EE changesJames Lopez2017-12-072-2/+10
* | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-075-27/+54
|\ \ \ | |/ / |/| |
| * | fix the missing reference to #references_per_projectmicael.bergeron2017-12-071-1/+1
| * | adding view and feature specsmicael.bergeron2017-12-071-0/+1
| * | add support for the commit reference filtermicael.bergeron2017-12-075-35/+51
| * | add support for commit (in mr) to reference filtermicael.bergeron2017-12-072-10/+20
* | | Remove Rugged::Repository#empty?Zeger-Jan van de Weg2017-12-075-32/+19
|/ /
* | Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'Sean McGivern2017-12-071-10/+8
|\ \
| * | CE backport of ProtectedBranches API changesJames Edwards-Jones2017-12-071-10/+8
* | | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-0714-133/+164
|\ \ \
| * | | Refactor banzai to support referencing from group contextce-backport-3615Jarka Kadlecova2017-12-0614-133/+164
* | | | Support uploads for groupsJarka Kadlecova2017-12-071-2/+16
* | | | Merge branch 'metrics/gb/add-tmp-stage-creation-metrics' into 'master'Kamil Trzciński2017-12-071-0/+16
|\ \ \ \