{"push_id":1177337605,"size":18,"distinct_size":1,"ref":"refs/heads/master","head":"047a2a9c7e5389d316fffb5d6ea11156b9773e4d","before":"0dff0f9530cefca805230e218a117349fd911176","commits":[{"sha":"a04dde5d0007b2fb7f0053125749ffded6047435","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"for discussion: basic demo attempt at optimistic locking","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/a04dde5d0007b2fb7f0053125749ffded6047435"},{"sha":"a5818060c9cbf52b0a4ae1c8e672ae09b1eac735","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"copy RevisionsHelper from Pro\n\nOtherwise the \"revision history\" page crashes","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/a5818060c9cbf52b0a4ae1c8e672ae09b1eac735"},{"sha":"b3ab6f0b9b692ce7b7a894b9c32b6d857a5bd312","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"edit conflict warning for notes","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/b3ab6f0b9b692ce7b7a894b9c32b6d857a5bd312"},{"sha":"d545ee0408b14455d0e869eb3dbba7e0a176813c","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"edit conflict warning for evidence","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/d545ee0408b14455d0e869eb3dbba7e0a176813c"},{"sha":"4b9b825d9f0426f917ce75f55a1e9462d5e254cd","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"edit conflict warning for issues","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/4b9b825d9f0426f917ce75f55a1e9462d5e254cd"},{"sha":"b20d4b44fa6ee461370ba08c28747973c2f08e78","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"DRY edit conflict tests; extract shared examples","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/b20d4b44fa6ee461370ba08c28747973c2f08e78"},{"sha":"8c9a64ac26b1c4fa41abc669b7342dee7b4677f7","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"extract shared view for confliction versions","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/8c9a64ac26b1c4fa41abc669b7342dee7b4677f7"},{"sha":"73941e69e456ae5478aac437ee62b4a57683713e","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"DRY edit conflict logic in controllers","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/73941e69e456ae5478aac437ee62b4a57683713e"},{"sha":"c0a049288557ff0bcad4dc616e5da2ea587d2d04","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"Merge branch 'master' into optimistic-locking","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/c0a049288557ff0bcad4dc616e5da2ea587d2d04"},{"sha":"116e62eb11c35c265427234152ecaf13f0557638","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"Merge branch 'master' into optimistic-locking","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/116e62eb11c35c265427234152ecaf13f0557638"},{"sha":"d9c7e15eda20913fa49cc08dfcc141d45f7430c0","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"refactor edit conflict logic and add comment","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/d9c7e15eda20913fa49cc08dfcc141d45f7430c0"},{"sha":"866067e1d888e7deef8e5874a02ea2475cc61511","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"fix incorrect spec descriptions","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/866067e1d888e7deef8e5874a02ea2475cc61511"},{"sha":"d7c1e2590b0358cbc508bd339a689d5b4ad2beeb","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"show whodunnit when there are edit conflicts","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/d7c1e2590b0358cbc508bd339a689d5b4ad2beeb"},{"sha":"9cca28ebd365e34b70dd937ea6c579938d814afe","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"remove 'while you were editing' from edit conflict link text\n\nIt's redundant (the explanation above the links should be enough) and takes up\ntoo much space","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/9cca28ebd365e34b70dd937ea6c579938d814afe"},{"sha":"35316c20e287a352be73f106bd6ad1d0ec8f0c2e","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"fix note edit conflicts spec on CI","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/35316c20e287a352be73f106bd6ad1d0ec8f0c2e"},{"sha":"f07f862b15f51f5273fc88e4c125a2b054cd5c55","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"remove outdated TODO comment","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/f07f862b15f51f5273fc88e4c125a2b054cd5c55"},{"sha":"67619a84a5149d4cb3bd7637233406437d2d7151","author":{"name":"George Millo","email":"7e42780bc6aff26b98b6fdd8b82c50957656cac5@gmail.com"},"message":"move user_for_paper_trail back into the controller","distinct":false,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/67619a84a5149d4cb3bd7637233406437d2d7151"},{"sha":"047a2a9c7e5389d316fffb5d6ea11156b9773e4d","author":{"name":"Daniel Martin","email":"59f884f52335208f3ca61bba1da175c6619a5be0@nomejortu.com"},"message":"Merge pull request #22 from dradis/optimistic-locking\n\nOptimistic locking","distinct":true,"url":"https://api.github.com/repos/dradis/dradis-ce/commits/047a2a9c7e5389d316fffb5d6ea11156b9773e4d"}]}
{"actor":{"display_login":"etdsoft"}}