summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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 '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-073-6/+4
|\ \
| * | fix failing specs due phantomJS scroll positionMike Greiling2017-08-041-4/+4
| * | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-042-2/+0
* | | Merge branch 'github' into 'master'Robert Speicher2017-08-072-25/+9
|\ \ \
| * | | Does not fetch repository when importing from GitHub on import serviceDouglas Barbosa Alexandre2017-08-071-24/+8
| * | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
* | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-075-12/+137
|\ \ \ \
| * | | | Fix html structureFilipa Lacerda2017-08-071-11/+0
| * | | | Port form back to use form_tagZ.J. van de Weg2017-08-071-2/+2
| * | | | Fix last feature test for project templatesZ.J. van de Weg2017-08-071-2/+2
| * | | | After merge cleanupZ.J. van de Weg2017-08-073-8/+4
| * | | | Fixes race condition in project uploadsTiago Botelho2017-08-071-0/+1
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-071289-4469/+9612
| |\ \ \ \
| * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-013-6/+21
| * | | | | 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-283-0/+95
* | | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-0710-133/+286
|\ \ \ \ \ \
| * | | | | | Show group milestones in autocompleteSean McGivern2017-08-071-0/+27
| * | | | | | Create system notes for group milestone changesSean McGivern2017-08-072-16/+43
| * | | | | | Support references to group milestonesSean McGivern2017-08-077-117/+216
| | |/ / / / | |/| | | |
* | | | | | Merge branch '36052-reset-only-migration-models' into 'master'Sean McGivern2017-08-072-2/+12
|\ \ \ \ \ \
| * | | | | | Reset only migration models36052-reset-only-migration-modelsLin Jen-Shin2017-08-072-2/+12
* | | | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-1/+205
* | | | | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-074-15/+40
|\ \ \ \ \ \ \
| * | | | | | | Allow wiki pages to be renamed in the UIwendy04022017-08-034-15/+40
* | | | | | | | Merge branch 'gitaly-386-shell-config' into 'master'Robert Speicher2017-08-071-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fix testsgitaly-386-shell-configKim "BKC" Carlbäcker2017-08-041-0/+2
* | | | | | | | Merge branch 'add-star-for-action-scope' into 'master'Rémy Coutable2017-08-072-15/+126
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename user_can_admin? because it's more accurateadd-star-for-action-scopeLin Jen-Shin2017-08-071-1/+1
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-07736-1892/+3197
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Cleanup tests and add admin_container_image toLin Jen-Shin2017-08-022-26/+31
| * | | | | | | | Implemented star auth capabilities on docker registry to enable deletion of i...Maxime Visonneau2017-08-021-6/+28
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scopeLin Jen-Shin2017-08-021681-15943/+49991
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix unit testing for adminJean Praloran2017-05-301-1/+1
| * | | | | | | | | fix typo and checkJean Praloran2017-05-301-7/+1
| * | | | | | | | | add test and rebaseJean Praloran2017-05-301-1/+91
* | | | | | | | | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-072-0/+68
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Memoize a user's personal projects countYorick Peterse2017-08-071-0/+24
| * | | | | | | | | | Improve checking if projects would be returnedYorick Peterse2017-08-071-0/+44
* | | | | | | | | | | Merge branch 'bvl-nfs-circuitbreaker' into 'master'Sean McGivern2017-08-0717-4/+762
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandErrorBob Van Landuyt2017-08-071-17/+18
| * | | | | | | | | | | 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-0739-239/+376
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | 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-042-2/+2
View Lorry Controller Status