summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-073-16/+160
|\
| * Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-073-16/+160
* | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-0/+71
|\ \
| * | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-5/+5
| * | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-0/+71
* | | Merge branch 'github' into 'master'Robert Speicher2017-08-071-1/+1
|\ \ \
| * | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
* | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+63
|\ \ \ \
| * | | | After merge cleanupZ.J. van de Weg2017-08-071-1/+1
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07292-1021/+2214
| |\ \ \ \
| * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-011-2/+17
| * | | | | Create rake task to create project templatesZ.J. van de Weg2017-08-011-2/+2
| * | | | | Allow projects to be started from a templateZ.J. van de Weg2017-07-281-0/+48
* | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-67/+129
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Support references to group milestonesSean McGivern2017-08-071-67/+129
| | |/ / / | |/| | |
* | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-1/+205
| |_|/ / |/| | |
* | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-071-1/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-07118-345/+595
| |\ \ \ \ | | |/ / /
| * | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-021-1/+2
* | | | | Use `broken_storage` in the fs_shards_spec.Bob Van Landuyt2017-08-071-1/+1
* | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-075-60/+100
|\ \ \ \ \
| * \ \ \ \ Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-071-3/+4
| |\ \ \ \ \
| | * | | | | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-041-3/+4
| * | | | | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-072-7/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-032-2/+1
| | * | | | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-031-5/+5
| * | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-4/+34
| |\ \ \ \ \ \
| | * | | | | | add tests for proper timezone date grouping within ContributionsCalendarMike Greiling2017-07-311-4/+34
| * | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-46/+56
* | | | | | | | Use ruby's `File.stat` to check storage availabilityBob Van Landuyt2017-08-041-3/+12
* | | | | | | | Only track accessibility onceBob Van Landuyt2017-08-041-3/+32
* | | | | | | | Use `keys` instead of `scan_each`Bob Van Landuyt2017-08-041-1/+3
* | | | | | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+1
* | | | | | | | Make sure the check works for paths with spaces.Bob Van Landuyt2017-08-041-0/+22
* | | | | | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-046-2/+418
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-031-17/+27
|\ \ \ \ \ \ \
| * | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-17/+27
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-0/+188
|\ \ \ \ \ \ \
| * | | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-0/+188
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-032-17/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-032-17/+8
* | | | | | | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-02105-213/+213
* | | | | | | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-021-0/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-021-0/+30
* | | | | | | Merge branch 'rs-empty_project-cleanup' into 'master'Rémy Coutable2017-08-0223-56/+56
|\ \ \ \ \ \ \
| * | | | | | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-0123-56/+56
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'mas...Douwe Maan2017-08-022-15/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Tests for query context variablesPawel Chojnacki2017-07-311-1/+1
| * | | | | | Context handling and tests cleanup + simple test kube_namespace context testPawel Chojnacki2017-07-312-15/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'blob-limit-test' into 'master'Sean McGivern2017-08-011-2/+8
|\ \ \ \ \ \