Tweet
Tweet

Slide 1

Slide 1 text

ୈ59ճPHPษڧձ ࠙਌ձLTͰGITLABͷ঺հ at Crocos, Inc. 2012/5/25 @sotarok

Slide 2

Slide 2 text

ࣗݾ঺հ sotarok Ͱ͢ ͦ͜Βʹ͍·͢ Perfume ͕޷͖Ͱ͢ ͙͙͍ͬͯͩ͘͞

Slide 3

Slide 3 text

Engineering Blog એ఻ http://engineering.crocos.jp/ ͍͍Ͷʂ͍ͯͩ͘͠͞ʂ

Slide 4

Slide 4 text

ͳΜ͔CandyCaneͷ ൃද͕੝ΜͩͬͨͷͰ GITLABͷ঺հͨ͘͠ͳͬͨ (ͻͶ͘Ε΋ͷ) ※ͪͳΈʹPHPؔ܎ͳ͍͚Ͳ

Slide 5

Slide 5 text

GITLAB ΈΜͳେ޷͖ GitHub Ϋϩʔϯ https://github.com/gitlabhq/gitlabhq

Slide 6

Slide 6 text

No content

Slide 7

Slide 7 text

GITLAB ιʔείʔυϒϥ΢β ίϛοτϩά Merge Request (Pull Request) Issues Wiki ωοτϫʔΫάϥϑ Wall

Slide 8

Slide 8 text

GITLAB ιʔείʔυϒϥ΢β ίϛοτϩά Merge Request (Pull Request) Issues Wiki ωοτϫʔΫάϥϑ Wall ཁ͢Δʹશ෦ೖΓ

Slide 9

Slide 9 text

GITLAB ಛ௃ ։ൃࢮ͵΄Ͳ଎͍ɾ׆ൃ ϝϦοτ: ػೳ͕ͲΜͲΜ૿͑Δ σϝϦοτ: ϝϯςφϯείετɺ҆ఆੑ ຖ݄22೔ϦϦʔε

Slide 10

Slide 10 text

ͳͥGITLAB/GitHub ͔ → Pull Request ϕʔεͷ։ൃ ಡΉͱ͍͍ ʮʮPull Requestʯ ͸ΦʔϓϯιʔεʹݶΒͣ࢖͑Δ ༏Εͨ։ൃϑϩʔͩʯ http://d.hatena.ne.jp/sotarok/ 20120219/1329581585 Ϋϩίεͷػೳ௥Ճ͸͢΂ͯ Merge Request Ͱɻ ϨϏϡʔޙ develop ΁Ϛʔδ

Slide 11

Slide 11 text

࣮ࡍ࢖ͬͯΈΔ demo

Slide 12

Slide 12 text

ͳΜ͔͋ͬͨτϥϒϧ (1) ϒϥ΢β্Ͱͷ automerge ػೳ 1౓࣮ࡍʹ merge Λࢼ͢࢓૊ΈʹͳͬͯΔ conflict ͨ͠··ͷϦϙδτϦΛ์ஔͯ͠Δ ...

Slide 13

Slide 13 text

ͳΜ͔͋ͬͨτϥϒϧ (2) ೔ຊޠͷϩάΛؚΉίϛοτϩά͕ग़ྗ͞Εͳ͍ grit ͱ͍͏ϥΠϒϥϦ͕όάͬͯΔ͍ͬͯ͏͔Ϛϧ νόΠτจࣈඇରԠʁ ڧҾʹpatch͋ͯͯରԠ

Slide 14

Slide 14 text

ͳΜ͔͋ͬͨτϥϒϧ (3) ಥવϦϙδτϦϒϥ΢β͕ 404

Slide 15

Slide 15 text

ͳΜ͔͋ͬͨτϥϒϧ (4) Submodule ͷมߋΛؚΉ Merge Request ͷ diff ͕ ग़ͳ͍ (ݱࡏਐߦத)

Slide 16

Slide 16 text

͍͚ͯͳ͍ͱ͜ gitolite-admin ʹґଘͯ͠Δ gitolite-admin ͔ͬͯʹ͍͡Δ ͨ͘͞Μpush͞Εͯ͏͍͟

Slide 17

Slide 17 text

ͦΕͳΓʹτϥϒϧ͸͋Δ͚Ͳ ศརͰ͢

Slide 18

Slide 18 text

ͦΕGitHub EnterpriseͰ 20ਓͷνʔϜͰ Total Yearly Cost $5,000 = 40ສ (ͪͳΈʹ 100 ਓͩͱ 200ສ) + ͋ͱͳΜ͔Ծ૝؀ڥ༻ҙ (GitHubͷ༻ҙ͢ΔVMΛϚ΢ ϯτͯ͠࢖͏ελΠϧ) (= ϝϯςίετ 0 Ͱ͸ͳ͍) தͷτϥϒϧ͸ϒϥοΫϘοΫεΒ͍͠ʢԿނ͔ෛՙ ߴ͍ͱ͔ʣ

Slide 19

Slide 19 text

·ͱΊ GitHub Enterprise ͓ۚ෷͑ΔͳΒɺ͜Ε͔ͭ͑͹͍͍ ͓ۚ෷͑ͳ͍ͳΒ GITLAB ࡉ͔͍ͱ͜Ζʹ໨ΛͭΉΕ͹OK