Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
GitLab Flow
Search
ogom
July 26, 2014
Programming
5
8.1k
GitLab Flow
GitLab with Flow
ogom
July 26, 2014
Tweet
Share
More Decks by ogom
See All by ogom
PicoRuby から始めるたのしい電子工作
ogom
0
900
GraphQL Better Errors
ogom
0
240
Osaka RubyKaigi 02
ogom
0
230
Osaka RubyKaigi 01
ogom
0
180
Contributing to GitLab with OSS Gate
ogom
0
450
DojoCon Japan 2017
ogom
0
110
GDStudy Engage
ogom
1
690
Using Immutable.js with React Redux
ogom
0
120
CoderDojo と オープンソース
ogom
2
460
Other Decks in Programming
See All in Programming
品質とスピードを両立: TypeScriptの柔軟な型システムをバックエンドで活用する
kosui
5
1.1k
Parallel Socket Communication in Swift
s_shimotori
0
260
どうしてこうなった命名集 ~🔥編~ / OOC 2024 LT
pictiny
4
2.9k
Open Source Swiftc Workshop
kitasuke
1
290
Learning PHP and Static Analysis with PHP Parser
inouehi
1
250
もうすぐ新年度、Babylon.jsがお勧めな3個の理由
hideg
0
170
複雑なドメインを扱うプロダクトの探索フェーズではいつどのようにテストをするのか / How to testing during exploratory phase
boykush
2
150
オブジェクト指向は必要なのか / Is object-oriented needed?
kishida
27
19k
TDDと今まで
kanayannet
0
140
実践!RDRAを活用した既存システムの仕様変更 / Specification Changes in Existing Systems Utilizing RDRA
imamotohikaru
0
2.8k
「コンパイル時のユニットテスト」導入するとユニットテストを 書かなくてよくなるのか?
tomohisa
9
2.2k
Compiling Python to WebAssembly with py2wasm
syrusakbary
0
140
Featured
See All Featured
jQuery: Nuts, Bolts and Bling
dougneiner
57
7.1k
Testing 201, or: Great Expectations
jmmastey
27
6.3k
GraphQLの誤解/rethinking-graphql
sonatard
48
9.1k
How STYLIGHT went responsive
nonsquared
92
4.7k
A Philosophy of Restraint
colly
195
15k
Optimizing for Happiness
mojombo
369
69k
Documentation Writing (for coders)
carmenintech
59
3.8k
Large-scale JavaScript Application Architecture
addyosmani
501
110k
Art, The Web, and Tiny UX
lynnandtonic
288
19k
Agile that works and the tools we love
rasmusluckow
323
20k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
272
12k
Six Lessons from altMBA
skipperchong
19
2.9k
Transcript
GitLab Flow 62nd Ruby/Rails ษڧձ@ؔ Takashi Ogomori
GitLab with Flow ਐԽ͢ΔGitHubΫϩʔϯΦʔϓϯιʔε։ൃϑϨʔϜϫʔΫ ϚʔδϦΫΤετ ! ͰίϥϘϨʔγϣϯ͔Βͷଚܟͱ৴པ 2/28
Profile " ogom # ogomr GitLab Cookbookͷ։ൃʹߩݙ ΦϨΦϨGitLabͷखॱΛհ GitLab.org Cookbook
· GitLab Cookbook with SSL · 3/28
Commercial GitHub࣮ફೖ ʮPull RequestʹΑΔ։ൃͷมֵʯ 4/28
$ GitLab 7.1.0 5/28
Admin area 6/28
Project 7/28
User 8/28
Group 9/28
Background Jobs 10/28
Project services 11/28
% Flow Styles 12/28
git-flow ෳͷϒϥϯνʹతͱϧʔϧΛ࣋ͨͤͯӡ༻ Branches આ໌ master ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ develop ։ൃ࡞ۀͷத৺ɻfeaturereleaseʹϚʔδ͢Δɻ feature ػೳՃͷ࡞ۀɻdevelop͔Βذͯ͠developʹϚʔδ͢Δɻ
release ϦϦʔεͷ४උ࡞ۀɻdevelop͔Βذͯ͠masterͱdevelopʹϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻmaster͔Βذͯ͠masterͱdevelopʹϚʔδ͢Δɻ & git-flow Cheat Sheet (ຊޠ) 13/28
GitHub Flow ̍ͭͷϒϥϯν(master)ΛϦϦʔεͰ͖Δঢ়ଶʹҡ࣋ͯ͠ӡ༻ Works આ໌ Create a branch master͔Βذͯ͠ɺϒϥϯνΛ࡞͢Δɻ Add
commits ։ൃ࡞ۀͷத৺ɻมߋͷίϛοτΛՃ͢Δɻ Open a Pull Request masterʹϓϧϦΫΤετΛૹ৴͢Δɻ Discuss and Review มߋͷ༰Λٞͯ͠ɺίʔυͷϨϏϡʔΛ͢Δɻ Merge and Deploy masterʹϚʔδͯ͠ɻϦϦʔε͢Δɻ & Understanding the GitHub Flow 14/28
GitLab Flow masterϒϥϯνͱstableϒϥϯνΛฏߦͰ։ൃ͢Δӡ༻ Branches આ໌ master ։ൃ࡞ۀͷத৺ɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ feature ػೳՃͷ࡞ۀɻmaster͔Βذͯ͠masterʹϚʔδ͢Δɻ stable
ϦϦʔεͰ͖Δঢ়ଶɻϦϦʔεʹλάΛ͚ͭΔɻଞͷϒϥϯν͔ΒϚʔδ͢Δɻ hotfix ϦϦʔεޙͷۓٸ࡞ۀɻstable͔Βذͯ͠stableͱmasterʹϚʔδ͢Δɻ & git-flow͔ΒdevelopϒϥϯνΛআ͍ͯGitHub Flowͱෳ߹ & masterɺfeature ͱstableɺhotfix ʹGitHub FlowΛదԠ 15/28
' GitLab Works 16/28
Creating a project 17/28
Create a feature branch 18/28
Add commits 19/28
Open a Merge Request 20/28
Merge and deploy 21/28
Create a stable branch 22/28
Create a hotfix branch 23/28
Add commits 24/28
Open a Merge Request 25/28
Merge and deploy 26/28
Continuous 27/28
Thank You! 28/28